From b25e96fd4935e2e3eab51203069f2f6deccab97c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 16 Oct 2012 04:00:02 +0200
Subject: [PATCH] build: remove support for Linux 3.1

---
 INSTALL                     | 2 +-
 configure.ac                | 2 +-
 doc/changelog.txt           | 2 +-
 extensions/compat_xtables.c | 4 +---
 extensions/compat_xtables.h | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index ef789aa..00e2737 100644
--- 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 6258272..c815f38 100644
--- 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 af37fb9..b54e6d1 100644
--- 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 0ac3526..851c0cc 100644
--- 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 af678f1..6d6d401 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(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)