RAWNAT: make iptable_rawpost compile with 2.6.30-rc5

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 023336d57de057f195a443ddfb1292b6960e7fbf..3be233173d9ff6481550c8677ab79173f3419ee1 100644 (file)
--- 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 b76a8bad9af98af58a596e2952b0703890e5277c..1cd9b263cff1aa02304a992cbe1a0b70622a67e7 100644 (file)
--- 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 bbb930c02696b07282e5eb7082a64bdd3b4406d3..a266c8ec6566435bb29b08a04e8e071cab3f8544 100644 (file)
--- 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);