build: remove support for Linux 4.0

diff --git a/configure.ac b/configure.ac
index 6de0d8595b85e57b5920adb5de669259acbac3cd..da3aa17ccdf91d109bbda1bc8ca15f3575deab6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ if test -n "$kbuilddir"; then
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
                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 0; then
+                       echo "WARNING: That kernel version is not officially supported.";
                elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then
                        :;
                else

diff --git a/doc/changelog.txt b/doc/changelog.txt
index df0d8b352cc71b816c9538bd924f27bfa5befd05..f9bbbf4c43950cdfbe996d262ba3b00b434462db 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -4,7 +4,7 @@ HEAD
 Enhancements:
 - support for Linux up to 4.15
 Changes:
-- remove support for Linux 3.7--3.19
+- remove support for Linux 3.7--4.0
 
 
 v2.14 (2017-11-22)

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index c847e45316869568588b5d00ec968fb25e25e3f5..57c7d1f206ef77b5b59ea6db90bbcfdbd6fde642 100644 (file)
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -8,8 +8,8 @@
 
 #define DEBUGP Use__pr_debug__instead
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
-#      warning Kernels below 4.0 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
+#      warning Kernels below 4.1 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

diff --git a/extensions/xt_DELUDE.c b/extensions/xt_DELUDE.c
index 917ab213f61404fc55bad4329462465e0d96c749..221f342d84046e6556204c566f8f98cab081ff04 100644 (file)
--- a/extensions/xt_DELUDE.c
+++ b/extensions/xt_DELUDE.c
@@ -107,13 +107,8 @@ static void delude_send_reset(struct net *net, struct sk_buff *oldskb,
 
        addr_type = RTN_UNSPEC;
 #ifdef CONFIG_BRIDGE_NETFILTER
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
        if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL &&
            nskb->nf_bridge->physoutdev))
-#else
-       if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL &&
-           nskb->nf_bridge->mask & BRNF_BRIDGED))
-#endif
 #else
        if (hook != NF_INET_FORWARD)
 #endif

diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index f759eb16dd45fccd1b522e13ca938f8317200fec..e152c9b6499cbd8b441f435028aabe2839555d8d 100644 (file)
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -249,13 +249,8 @@ static void tarpit_tcp4(struct net *net, struct sk_buff *oldskb,
                niph->id = ~oldhdr->id + 1;
 
 #ifdef CONFIG_BRIDGE_NETFILTER
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
        if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL &&
            nskb->nf_bridge->physoutdev != NULL))
-#else
-       if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL &&
-           nskb->nf_bridge->mask & BRNF_BRIDGED))
-#endif
 #else
        if (hook != NF_INET_FORWARD)
 #endif
@@ -287,12 +282,9 @@ static void tarpit_tcp4(struct net *net, struct sk_buff *oldskb,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
        NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+#else
        NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output_sk);
-#else
-       NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb, NULL,
-               skb_dst(nskb)->dev, dst_output);
 #endif
        return;
 
@@ -410,12 +402,9 @@ static void tarpit_tcp6(struct net *net, struct sk_buff *oldskb,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
        NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+#else
        NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output_sk);
-#else
-       NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb, NULL,
-               skb_dst(nskb)->dev, dst_output);
 #endif
        return;