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.9
Date: Mon, 26 Dec 2016 16:11:43 +0100 [thread overview]
Message-ID: <1482765103-31863-1-git-send-email-ralph.sennhauser@gmail.com> (raw)
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
reply other threads:[~2016-12-26 15:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1482765103-31863-1-git-send-email-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).