build: support for Linux 4.12

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>

diff --git a/configure.ac b/configure.ac
index 4df956f127fd47ac09375330efdd1cf839045554..5add822a22bf2acd40a929da9e4195ab1f3c513f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ if test -n "$kbuilddir"; then
                echo "WARNING: Version detection did not succeed. Continue at own luck.";
        else
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-               if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 10; then
+               if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 12; then
                        echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
                elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then
                        :;

diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index ed146049e216a860876dbfcbe30732ce7b1ed153..6c00d1d1bab63186e9c40af04a48eaceff71319b 100644 (file)
--- 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);