From: Patrick McHardy <kaber@trash.net>
To: "David S. Miller" <davem@davemloft.net>
Cc: Netfilter Development Mailinglist <netfilter-devel@lists.netfilter.org>
Subject: [PATCH 2.4 2/8]: Fix another DECLARE_MUTEX in header file
Date: Fri, 04 Mar 2005 13:18:42 +0100 [thread overview]
Message-ID: <42285222.4010709@trash.net> (raw)
[-- Attachment #1: 02.diff --]
[-- Type: text/x-patch, Size: 1835 bytes --]
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/02/09 00:01:18+01:00 sj-netfilter@cookinglinux.org
# [NETFILTER]: Fix another DECLARE_MUTEX in header file
#
# Signed-off-by: Samuel Jean <sjean@cookinglinux.org>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# net/ipv6/netfilter/ip6_tables.c
# 2005/02/09 00:01:16+01:00 sj-netfilter@cookinglinux.org +1 -0
# [NETFILTER]: Fix another DECLARE_MUTEX in header file
#
# Signed-off-by: Samuel Jean <sjean@cookinglinux.org>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# include/linux/netfilter_ipv6/ip6_tables.h
# 2005/02/09 00:01:15+01:00 sj-netfilter@cookinglinux.org +0 -2
# [NETFILTER]: Fix another DECLARE_MUTEX in header file
#
# Signed-off-by: Samuel Jean <sjean@cookinglinux.org>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
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-04 01:52:01 +01:00
+++ b/include/linux/netfilter_ipv6/ip6_tables.h 2005-03-04 01:52:01 +01: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-04 01:52:01 +01:00
+++ b/net/ipv6/netfilter/ip6_tables.c 2005-03-04 01:52:01 +01: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)
reply other threads:[~2005-03-04 12:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42285222.4010709@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.