From 28d12faba89b71696a5edf067611298a5520ef0b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 16 Oct 2012 00:37:09 +0200
Subject: [PATCH] build: remove support for Linux 2.6.29

---
 doc/changelog.txt             | 2 +-
 extensions/compat_xtables.c   | 8 ++++----
 extensions/compat_xtables.h   | 4 ++--
 extensions/ip6table_rawpost.c | 3 ---
 extensions/iptable_rawpost.c  | 3 ---
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 9460a87..230d8b0 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.28
+- remove support for Linux 2.6.17--2.6.29
 
 
 v1.47.1 (2010-10-15)
diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index 18ce42a..e766b52 100644
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -30,7 +30,7 @@
 #	define WITH_IPV6 1
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_match_run(const struct sk_buff *skb,
     const struct xt_match_param *par)
@@ -56,7 +56,7 @@ static bool xtnu_match_run(const struct sk_buff *skb,
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_match_check(const struct xt_mtchk_param *par)
 {
@@ -146,7 +146,7 @@ void xtnu_unregister_matches(struct xtnu_match *nt, unsigned int num)
 EXPORT_SYMBOL_GPL(xtnu_unregister_matches);
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static unsigned int
 xtnu_target_run(struct sk_buff *skb, const struct xt_target_param *par)
@@ -174,7 +174,7 @@ xtnu_target_run(struct sk_buff *skb, const struct xt_action_param *par)
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_target_check(const struct xt_tgchk_param *par)
 {
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 759b007..6faaa91 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(2, 6, 28)
-#	warning Kernels below 2.6.28 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+#	warning Kernels below 2.6.30 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
diff --git a/extensions/ip6table_rawpost.c b/extensions/ip6table_rawpost.c
index 2159876..eebe026 100644
--- a/extensions/ip6table_rawpost.c
+++ b/extensions/ip6table_rawpost.c
@@ -65,9 +65,6 @@ static int __init rawpost6_table_init(void)
 {
 	int ret;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29)
-	rwlock_init(&rawpost6_itable.lock);
-#endif
 	rawpost6_ptable = ip6t_register_table(&init_net, &rawpost6_itable,
 	                  &rawpost6_initial.repl);
 	if (IS_ERR(rawpost6_ptable))
diff --git a/extensions/iptable_rawpost.c b/extensions/iptable_rawpost.c
index 9abea27..2ccce29 100644
--- a/extensions/iptable_rawpost.c
+++ b/extensions/iptable_rawpost.c
@@ -66,9 +66,6 @@ static int __init rawpost4_table_init(void)
 {
 	int ret;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29)
-	rwlock_init(&rawpost4_itable.lock);
-#endif
 	rawpost4_ptable = ipt_register_table(&init_net, &rawpost4_itable,
 	                  &rawpost4_initial.repl);
 	if (IS_ERR(rawpost4_ptable))