build: remove support for Linux 2.6.38

diff --git a/INSTALL b/INSTALL
index b456c32b506a9c54eb8ae0188d5a37e1d40e0201..0f3b45d8634a40b5da7b633778f0e848e05eaf00 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
        * iptables >= 1.4.5
 
-       * kernel-devel >= 2.6.38
+       * kernel-devel >= 2.6.39
          with prepared build/output directory
          - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
          - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK

diff --git a/configure.ac b/configure.ac
index e00258918f91262aa6fba19d047634521bf972ec..b706a3943530baadb8c4c9628ca64fc164406617 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if test -n "$kbuilddir"; then
                        echo "WARNING: That kernel version is not officially supported.";
                elif test "$kmajor" -eq 3; then
                        :;
-               elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 38; then
+               elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 39; then
                        :;
                else
                        echo "WARNING: That kernel version is not officially supported.";

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 4da92969d88acd2bef838b96261ff1daf13fe58b..f67e1e7e142642690b6c536ddb7ce4e20b759fe4 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.37
+- remove support for Linux 2.6.17–2.6.38
 - remove xt_TEE (this is available upstream since 2.6.35)
 - remove xt_CHECKSUM (this is available upstream since 2.6.36)
 

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 1f4d4e59155a080a15a05e8f4c7161fe709cd6b6..c11dad6c0d99ca8cfa0e7da820cf7a42bc26804c 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, 38)
-#      warning Kernels below 2.6.38 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+#      warning Kernels below 2.6.39 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

diff --git a/extensions/xt_ECHO.c b/extensions/xt_ECHO.c
index 057d81aedc6a7ea83769b75a2d72d311a2055a83..dac5ebe53b6448d2f814500310fc086c81101099 100644 (file)
--- a/extensions/xt_ECHO.c
+++ b/extensions/xt_ECHO.c
@@ -105,11 +105,7 @@ echo_tg6(struct sk_buff **poldskb, const struct xt_action_param *par)
        }
 
        skb_dst_set(newskb, dst);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
        newip->hop_limit = ip6_dst_hoplimit(skb_dst(newskb));
-#else
-       newip->hop_limit = dst_metric(skb_dst(newskb), RTAX_HOPLIMIT);
-#endif
        newskb->ip_summed = CHECKSUM_NONE;
 
        /* "Never happens" (?) */
@@ -199,11 +195,7 @@ echo_tg4(struct sk_buff **poldskb, const struct xt_action_param *par)
        if (ip_route_me_harder(&newskb, RTN_UNSPEC) != 0)
                goto free_nskb;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
        newip->ttl = ip4_dst_hoplimit(skb_dst(newskb));
-#else
-       newip->ttl = dst_metric(skb_dst(newskb), RTAX_HOPLIMIT);
-#endif
        newskb->ip_summed = CHECKSUM_NONE;
 
        /* "Never happens" (?) */

diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index f55d7f703f1ef4febfcbd32551a4dd93975828cd..dfacf036c42546f0a38a1c0cceca085fcf171b05 100644 (file)
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -267,11 +267,7 @@ static void tarpit_tcp4(struct sk_buff *oldskb, unsigned int hook,
        if (mode == XTTARPIT_HONEYPOT)
                niph->ttl = 128;
        else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
                niph->ttl = ip4_dst_hoplimit(skb_dst(nskb));
-#else
-               niph->ttl = dst_metric(skb_dst(nskb), RTAX_HOPLIMIT);
-#endif
 
        /* Adjust IP checksum */
        niph->check = 0;
@@ -363,11 +359,7 @@ static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
        if (mode == XTTARPIT_HONEYPOT) {
                ip6h->hop_limit = 128;
        } else {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
                ip6h->hop_limit = ip6_dst_hoplimit(skb_dst(nskb));
-#else
-               ip6h->hop_limit = dst_metric(skb_dst(nskb), RTAX_HOPLIMIT);
-#endif
        }
 
        tcph = (struct tcphdr *)(skb_network_header(nskb) +