* [PATCH xtables-addons] build: support for Linux 4.12
@ 2017-05-14 16:16 Ralph Sennhauser
2017-06-15 9:57 ` Jan Engelhardt
0 siblings, 1 reply; 2+ messages in thread
From: Ralph Sennhauser @ 2017-05-14 16:16 UTC (permalink / raw)
To: netfilter-devel; +Cc: Ralph Sennhauser
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH xtables-addons] build: support for Linux 4.12
2017-05-14 16:16 [PATCH xtables-addons] build: support for Linux 4.12 Ralph Sennhauser
@ 2017-06-15 9:57 ` Jan Engelhardt
0 siblings, 0 replies; 2+ messages in thread
From: Jan Engelhardt @ 2017-06-15 9:57 UTC (permalink / raw)
To: Ralph Sennhauser; +Cc: netfilter-devel
On Sunday 2017-05-14 18:16, Ralph Sennhauser wrote:
>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.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-15 10:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-14 16:16 [PATCH xtables-addons] build: support for Linux 4.12 Ralph Sennhauser
2017-06-15 9:57 ` Jan Engelhardt
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).