From 31aebc134ec4f75b665722aa2bb1afb8d109d274 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Oct 2012 23:24:07 +0200
Subject: [PATCH] build: remove support for Linux 2.6.20

---
 doc/changelog.txt           |  2 +-
 extensions/compat_rawpost.h | 22 ----------------------
 extensions/compat_xtables.h |  4 ++--
 extensions/xt_DELUDE.c      |  6 ------
 extensions/xt_TARPIT.c      |  6 ------
 5 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index c81ad7a..79bf6ca 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.19
+- remove support for Linux 2.6.17--2.6.20
 
 
 v1.47.1 (2010-10-15)
diff --git a/extensions/compat_rawpost.h b/extensions/compat_rawpost.h
index 11c575f..44d298e 100644
--- a/extensions/compat_rawpost.h
+++ b/extensions/compat_rawpost.h
@@ -62,26 +62,4 @@ typedef struct sk_buff *sk_buff_t;
 
 #endif /* 2.6.21 */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)
-#	include <linux/netfilter_ipv6/ip6_tables.h>
-/* Standard entry */
-struct ip6t_standard
-{
-	struct ip6t_entry entry;
-	struct ip6t_standard_target target;
-};
-
-struct ip6t_error_target
-{
-	struct ip6t_entry_target target;
-	char errorname[IP6T_FUNCTION_MAXNAMELEN];
-};
-
-struct ip6t_error
-{
-	struct ip6t_entry entry;
-	struct ip6t_error_target target;
-};
-#endif /* 2.6.20 */
-
 #endif /* XTA_COMPAT_RAWPOST_H */
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index f423e72..551f10c 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(2, 6, 20)
-#	warning Kernels below 2.6.20 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+#	warning Kernels below 2.6.21 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 c24c9fc..2562677 100644
--- a/extensions/xt_DELUDE.c
+++ b/extensions/xt_DELUDE.c
@@ -100,15 +100,9 @@ static void delude_send_reset(struct sk_buff *oldskb, unsigned int hook)
 		}
 	}
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)
-	tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr), niph->saddr,
-	              niph->daddr, csum_partial((char *)tcph,
-	              sizeof(struct tcphdr), 0));
-#else
 	tcph->check = tcp_v4_check(sizeof(struct tcphdr), niph->saddr,
 	              niph->daddr, csum_partial((char *)tcph,
 	              sizeof(struct tcphdr), 0));
-#endif
 
 	addr_type = RTN_UNSPEC;
 #ifdef CONFIG_BRIDGE_NETFILTER
diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index b5e88d8..f55d7f7 100644
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -237,15 +237,9 @@ static void tarpit_tcp4(struct sk_buff *oldskb, unsigned int hook,
 
 	/* Adjust TCP checksum */
 	tcph->check = 0;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)
-	tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr), niph->saddr,
-	              niph->daddr, csum_partial((char *)tcph,
-	              sizeof(struct tcphdr), 0));
-#else
 	tcph->check = tcp_v4_check(sizeof(struct tcphdr), niph->saddr,
 	              niph->daddr, csum_partial((char *)tcph,
 	              sizeof(struct tcphdr), 0));
-#endif
 
 	/* Set DF, id = 0 */
 	niph->frag_off = htons(IP_DF);