diff --git a/INSTALL b/INSTALL index b456c32..0f3b45d 100644 --- 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 e002589..b706a39 100644 --- 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 4da9296..f67e1e7 100644 --- 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 1f4d4e5..c11dad6 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, 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 057d81a..dac5ebe 100644 --- 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 f55d7f7..dfacf03 100644 --- 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) +