* [PATCH xtables-addons] build: support for Linux 4.9
@ 2016-12-26 15:11 Ralph Sennhauser
0 siblings, 0 replies; only message in thread
From: Ralph Sennhauser @ 2016-12-26 15:11 UTC (permalink / raw)
To: netfilter-devel; +Cc: Ralph Sennhauser
Commit f330a7fdbe1611104622faff7e614a246a7d20f0 (netfilter: conntrack:
get rid of conntrack timer) replaces timer_list with an u32, use helper
from commit c8607e020014cf11a61601a0005270bad81cabdf (netfilter: nft_ct:
fix expiration getter).
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
extensions/xt_LOGMARK.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index 271931b..7616962 100644
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -58,8 +58,12 @@ static void logmark_ct(const struct nf_conn *ct, enum ip_conntrack_info ctinfo)
printk("%s""ASSURED", prev++ ? "," : "");
if (ct->status & IPS_CONFIRMED)
printk("%s""CONFIRMED", prev++ ? "," : "");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
+ printk(" lifetime=%lus", nf_ct_expires(ct) / HZ);
+#else
printk(" lifetime=%lus",
(jiffies - ct->timeout.expires) / HZ);
+#endif
}
static unsigned int
--
2.7.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-26 15:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26 15:11 [PATCH xtables-addons] build: support for Linux 4.9 Ralph Sennhauser
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.