From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 15 May 2009 16:35:53 +0000 (+0200)
Subject: RAWNAT: make iptable_rawpost compile with 2.6.30-rc5
X-Git-Tag: v1.16~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e59a6dce1b18cd7d1d2a20ecfb7cdcfe047767;p=thirdparty%2Fxtables-addons.git

RAWNAT: make iptable_rawpost compile with 2.6.30-rc5
---

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 023336d..3be2331 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,5 +1,8 @@
 
 
+- RAWNAT: make iptable_rawpost compile with 2.6.30-rc5
+
+
 Xtables-addons 1.15 (April 30 2009)
 ===================================
 - build: add kernel version check to configure
diff --git a/extensions/ip6table_rawpost.c b/extensions/ip6table_rawpost.c
index b76a8ba..1cd9b26 100644
--- a/extensions/ip6table_rawpost.c
+++ b/extensions/ip6table_rawpost.c
@@ -69,7 +69,9 @@ static int __init rawpost6_table_init(void)
 {
 	int ret;
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29)
 	rwlock_init(&rawpost6_itable.lock);
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
 	rawpost6_ptable = ip6t_register_table(&init_net, &rawpost6_itable,
 	                  &rawpost6_initial.repl);
diff --git a/extensions/iptable_rawpost.c b/extensions/iptable_rawpost.c
index bbb930c..a266c8e 100644
--- a/extensions/iptable_rawpost.c
+++ b/extensions/iptable_rawpost.c
@@ -70,7 +70,9 @@ static int __init rawpost4_table_init(void)
 {
 	int ret;
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29)
 	rwlock_init(&rawpost4_itable.lock);
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
 	rawpost4_ptable = ipt_register_table(&init_net, &rawpost4_itable,
 	                  &rawpost4_initial.repl);