| Message ID | 20170514161611.8498-1-ralph.sennhauser@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Pablo Neira |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(+)