ChangeSet 1.1448.114.1, 2005/02/08 16:37:27+01:00, [EMAIL PROTECTED]
[NETFILTER]: Fix DECLARE_MUTEX in header file
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
include/linux/netfilter_ipv4/ip_tables.h | 1 -
net/ipv4/netfilter/ip_tables.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff -Nru a/include/linux/netfilter_ipv4/ip_tables.h
b/include/linux/netfilter_ipv4/ip_tables.h
--- a/include/linux/netfilter_ipv4/ip_tables.h 2005-03-25 17:02:31 -08:00
+++ b/include/linux/netfilter_ipv4/ip_tables.h 2005-03-25 17:02:31 -08:00
@@ -336,7 +336,6 @@
/*
* Main firewall chains definitions and global var's definitions.
*/
-static DECLARE_MUTEX(ipt_mutex);
#ifdef __KERNEL__
#include <linux/init.h>
diff -Nru a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
--- a/net/ipv4/netfilter/ip_tables.c 2005-03-25 17:02:31 -08:00
+++ b/net/ipv4/netfilter/ip_tables.c 2005-03-25 17:02:31 -08:00
@@ -53,6 +53,8 @@
#endif
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
+static DECLARE_MUTEX(ipt_mutex);
+
/* Must have mutex */
#define ASSERT_READ_LOCK(x) IP_NF_ASSERT(down_trylock(&ipt_mutex) != 0)
#define ASSERT_WRITE_LOCK(x) IP_NF_ASSERT(down_trylock(&ipt_mutex) != 0)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
