ChangeSet 1.1448.114.2, 2005/02/09 00:01:18+01:00, [EMAIL PROTECTED]
[NETFILTER]: Fix another DECLARE_MUTEX in header file
Signed-off-by: Samuel Jean <[EMAIL PROTECTED]>
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
include/linux/netfilter_ipv6/ip6_tables.h | 2 --
net/ipv6/netfilter/ip6_tables.c | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff -Nru a/include/linux/netfilter_ipv6/ip6_tables.h
b/include/linux/netfilter_ipv6/ip6_tables.h
--- a/include/linux/netfilter_ipv6/ip6_tables.h 2005-03-25 17:02:35 -08:00
+++ b/include/linux/netfilter_ipv6/ip6_tables.h 2005-03-25 17:02:35 -08:00
@@ -106,8 +106,6 @@
u_int64_t pcnt, bcnt; /* Packet and byte counters */
};
-static DECLARE_MUTEX(ip6t_mutex);
-
/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
protocols */
diff -Nru a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
--- a/net/ipv6/netfilter/ip6_tables.c 2005-03-25 17:02:35 -08:00
+++ b/net/ipv6/netfilter/ip6_tables.c 2005-03-25 17:02:35 -08:00
@@ -58,6 +58,7 @@
#endif
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
+static DECLARE_MUTEX(ip6t_mutex);
/* Must have mutex */
#define ASSERT_READ_LOCK(x) IP_NF_ASSERT(down_trylock(&ip6t_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
