From 10f951e61d44c20bf66eee23b96ea8fefa294fa1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 12 Feb 2018 14:53:01 +0100
Subject: [PATCH] build: remove support for Linux 4.0

---
 configure.ac                |  2 ++
 doc/changelog.txt           |  2 +-
 extensions/compat_xtables.h |  4 ++--
 extensions/xt_DELUDE.c      |  5 -----
 extensions/xt_TARPIT.c      | 15 ++-------------
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6de0d85..da3aa17 100644
--- 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 df0d8b3..f9bbbf4 100644
--- 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 c847e45..57c7d1f 100644
--- 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 917ab21..221f342 100644
--- 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 f759eb1..e152c9b 100644
--- 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;