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

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

diff --git a/INSTALL b/INSTALL
index d6e6699..2ba7d81 100644
--- 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 ba93be8..213ff9b 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 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 7b4f1f3..3ace343 100644
--- 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 0840624..a6fdc24 100644
--- 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 1164c8a..1425d5e 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, 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