# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/02/08 16:37:27+01:00 pablo@eurodev.net # [NETFILTER]: Fix DECLARE_MUTEX in header file # # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/ip_tables.c # 2005/02/08 16:37:26+01:00 pablo@eurodev.net +2 -0 # [NETFILTER]: Fix DECLARE_MUTEX in header file # # Signed-off-by: Patrick McHardy # # include/linux/netfilter_ipv4/ip_tables.h # 2005/02/08 16:37:26+01:00 pablo@eurodev.net +0 -1 # [NETFILTER]: Fix DECLARE_MUTEX in header file # # Signed-off-by: Patrick McHardy # 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-04 01:52:00 +01:00 +++ b/include/linux/netfilter_ipv4/ip_tables.h 2005-03-04 01:52:00 +01:00 @@ -336,7 +336,6 @@ /* * Main firewall chains definitions and global var's definitions. */ -static DECLARE_MUTEX(ipt_mutex); #ifdef __KERNEL__ #include 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-04 01:52:00 +01:00 +++ b/net/ipv4/netfilter/ip_tables.c 2005-03-04 01:52:00 +01: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)