netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Subject: [PATCH xtables-addons] build: support for Linux 4.12
Date: Sun, 14 May 2017 18:16:11 +0200	[thread overview]
Message-ID: <20170514161611.8498-1-ralph.sennhauser@gmail.com> (raw)

As a result of commit cc41c84b7e7f ("netfilter: kill the fake untracked
conntrack objects") the helper nf_ct_is_untracked always returns false
and commit ab8bc7ed864b ("netfilter: remove nf_ct_is_untracked") removes
it all together.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
 extensions/xt_LOGMARK.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index ed14604..6c00d1d 100644
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -87,8 +87,10 @@ logmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
 	printk(" ctdir=%s", dir_names[ctinfo >= IP_CT_IS_REPLY]);
 	if (ct == NULL)
 		printk(" ct=NULL ctmark=NULL ctstate=INVALID ctstatus=NONE");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
 	else if (nf_ct_is_untracked(ct))
 		printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE");
+#endif
 	else
 		logmark_ct(ct, ctinfo);
 
-- 
2.10.2


             reply	other threads:[~2017-05-14 16:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-14 16:16 Ralph Sennhauser [this message]
2017-06-15  9:57 ` [PATCH xtables-addons] build: support for Linux 4.12 Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170514161611.8498-1-ralph.sennhauser@gmail.com \
    --to=ralph.sennhauser@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).