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

---
 INSTALL                     |  2 +-
 configure.ac                |  2 +-
 doc/changelog.txt           |  2 +-
 extensions/compat_xtables.c |  9 ---------
 extensions/compat_xtables.h | 11 ++---------
 extensions/xt_DNETMAP.c     |  6 +-----
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/INSTALL b/INSTALL
index 00e2737..cb67cd2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
 	* iptables >= 1.4.5
 
-	* kernel-devel >= 3.2
+	* kernel-devel >= 3.3
 	  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 c815f38..1c35a4f 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 2; then
+		elif test "$kmajor" -eq 3 -a "$kminor" -ge 3; then
 			:;
 		else
 			echo "WARNING: That kernel version is not officially supported.";
diff --git a/doc/changelog.txt b/doc/changelog.txt
index b54e6d1..326925e 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17–3.1
+- remove support for Linux 2.6.17–3.2
 - 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 851c0cc..0840624 100644
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -154,15 +154,6 @@ void *HX_memmem(const void *space, size_t spacesize,
 }
 EXPORT_SYMBOL_GPL(HX_memmem);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && defined(WITH_IPV6)
-int xtnu_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
-    uint8_t *nexthdrp, __be16 *fragoffp)
-{
-	return ipv6_skip_exthdr(skb, start, nexthdrp);
-}
-EXPORT_SYMBOL_GPL(xtnu_ipv6_skip_exthdr);
-#endif
-
 #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)
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 6d6d401..ffcf6fe 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, 2, 0)
-#	warning Kernels below 3.2 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#	warning Kernels below 3.3 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -26,13 +26,6 @@
 
 #define rt_dst(rt)	(&(rt)->dst)
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-#	define nf_nat_ipv4_multi_range_compat nf_nat_multi_range_compat
-#	define nf_nat_ipv4_range nf_nat_range
-#	define NF_NAT_RANGE_MAP_IPS IP_NAT_RANGE_MAP_IPS
-#	define ipv6_skip_exthdr xtnu_ipv6_skip_exthdr
-#endif
-
 #if !defined(NIP6) && !defined(NIP6_FMT)
 #	define NIP6(addr) \
 		ntohs((addr).s6_addr16[0]), \
diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c
index fe2b269..989f702 100644
--- a/extensions/xt_DNETMAP.c
+++ b/extensions/xt_DNETMAP.c
@@ -30,11 +30,7 @@
 #include <net/netfilter/nf_nat_rule.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-#	include <net/netfilter/nf_nat.h>
-#else
-#	include <linux/netfilter/nf_nat.h>
-#endif
+#include <linux/netfilter/nf_nat.h>
 #include "compat_xtables.h"
 #include "xt_DNETMAP.h"