build: remove support for Linux 3.4

diff --git a/INSTALL b/INSTALL
index d6e6699ca2a11476c0c8a67499416f8981a71f08..2ba7d81f8474339b8b2e3d1bc100bf929401473f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
        * iptables >= 1.4.5
 
-       * kernel-devel >= 3.4
+       * kernel-devel >= 3.5
          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 ba93be88924d6d91b2346696633b20ee5b49e38c..213ff9bef67bee0ac1a31aa25d502ca0816f3244 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ if test -n "$kbuilddir"; then
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
                if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 6; then
                        echo "WARNING: That kernel version is not officially supported.";
-               elif test "$kmajor" -eq 3 -a "$kminor" -ge 4; then
+               elif test "$kmajor" -eq 3 -a "$kminor" -ge 5; then
                        :;
                else
                        echo "WARNING: That kernel version is not officially supported.";

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 7b4f1f3b1591b98c607fc0a73208a0fdaf519e2b..3ace343a655da8880f0e206668935a7e9e111821 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17–3.3
+- remove support for Linux 2.6.17–3.4
 - 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.c b/extensions/compat_xtables.c
index 0840624c86cbac75454bfafeeed5cf297336ca7a..a6fdc24779531e304896c7cbd757667ad06c7937 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -154,13 +154,4 @@ void *HX_memmem(const void *space, size_t spacesize,
 }
 EXPORT_SYMBOL_GPL(HX_memmem);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) && defined(WITH_IPV6)
-int xtnu_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
-    int target, unsigned short *fragoff, int *fragflg)
-{
-       return ipv6_find_hdr(skb, offset, target, fragoff);
-}
-EXPORT_SYMBOL_GPL(xtnu_ipv6_find_hdr);
-#endif
-
 MODULE_LICENSE("GPL");

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 1164c8a6478dee3f64067d7d4627c783ae557183..1425d5e17966e5a50f8a4fa3438f5790931a51c9 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(3, 4, 0)
-#      warning Kernels below 3.4 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
+#      warning Kernels below 3.5 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -47,10 +47,6 @@
 #      define NIPQUAD_FMT "%u.%u.%u.%u"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
-#      define ipv6_find_hdr xtnu_ipv6_find_hdr
-#endif
-
 #define ip_route_me_harder    xtnu_ip_route_me_harder
 #define skb_make_writable     xtnu_skb_make_writable
 #define xt_target             xtnu_target