build: remove support for Linux 2.6.29

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 9460a874ed859d8b13af8c9b2de4802f710cd0f2..230d8b0c70c42fee68b780a1716e488a1bbb942b 100644 (file)
--- 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 18ce42af30a744f39da1621837f6b04fd4c00e43..e766b5208f938e1d3a5c9a378ebe2717178d206c 100644 (file)
--- 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 759b0079a0f3627865c9d90a9879a0aee720b82a..6faaa918c3a54501c3e318a89b3bc7c02eb75882 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(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 2159876174271a0da8ad0d920503c87b855e2d21..eebe0267313deb50ff1fbac465f900edbf76c92b 100644 (file)
--- 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 9abea278618164ebd812fd782345fe71c1b04569..2ccce295109f947ced3a2a49ddc3ae4e15c30ce4 100644 (file)
--- 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))