build: remove support for Linux 2.6.20

diff --git a/doc/changelog.txt b/doc/changelog.txt
index c81ad7a8faa9647951988945ab5874d4992342ef..79bf6cac9f5d1574768d268ad835efe9e49d061b 100644 (file)
--- 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 11c575f32c117a1a2bfcaf7fe8bbd457a48eac15..44d298ee970255f3c834d9a1d0698383894a7cf7 100644 (file)
--- 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 f423e72b4047997ab0d14fd77962e24a7c4b9996..551f10c4f14853e709487c4e95ab22b9b69b20cc 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(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 c24c9fc3c616fbfc3efc6ef37233e873a02b9e67..2562677d480b9fff1c00178139df2f0a8583bae0 100644 (file)
--- 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 b5e88d81013ae1c7b5f3efebf43e074502caa7ee..f55d7f703f1ef4febfcbd32551a4dd93975828cd 100644 (file)
--- 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);