build: remove support for Linux 3.1

diff --git a/INSTALL b/INSTALL
index ef789aa16fa6cee5db18244851256e476b02914b..00e273788f4d440038b6b428f7730101f6809c29 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
        * iptables >= 1.4.5
 
-       * kernel-devel >= 3.1
+       * kernel-devel >= 3.2
          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 6258272c9248bb5fc77077c1a14bc774db4556f3..c815f38d2b70629b18fdbc0a54b062461404b4a5 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 1; then
+               elif test "$kmajor" -eq 3 -a "$kminor" -ge 2; then
                        :;
                else
                        echo "WARNING: That kernel version is not officially supported.";

diff --git a/doc/changelog.txt b/doc/changelog.txt
index af37fb9ad82155b0553919c8cd0c045dd42201f8..b54e6d190fb7d590f9cc1debde9b9284b3042a54 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17–3.0
+- remove support for Linux 2.6.17–3.1
 - 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 0ac35268131625c1a9d6b391068efe7d42b05564..851c0ccf010cdd50bdbb03ea7455ca4c5e9ef30d 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -21,9 +21,7 @@
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/route.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-#      include <linux/export.h>
-#endif
+#include <linux/export.h>
 #include "compat_skbuff.h"
 #include "compat_xtnu.h"
 #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index af678f187fccbd66597feb447bba45d5ee13548d..6d6d4017a7a6b049aa4c255e6f24af7ba9fe699b 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, 1, 0)
-#      warning Kernels below 3.1 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+#      warning Kernels below 3.2 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)