diff options
| author | Arnd Bergmann <arnd@relay.de.ibm.com> | 2010-03-09 20:59:15 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2010-08-19 17:18:01 -0700 |
| commit | 0906a372f2aa0fec1e59bd12b896883b6e41307a (patch) | |
| tree | 2c54c422c46f0addc1d1a2cd69ddecffd09a41f7 /net/netfilter/nf_conntrack_proto.c | |
| parent | 2be85279281bafe7de808ca99de59af4fd474c49 (diff) | |
| download | kernel_samsung_smdk4412-0906a372f2aa0fec1e59bd12b896883b6e41307a.zip kernel_samsung_smdk4412-0906a372f2aa0fec1e59bd12b896883b6e41307a.tar.gz kernel_samsung_smdk4412-0906a372f2aa0fec1e59bd12b896883b6e41307a.tar.bz2 | |
net/netfilter: __rcu annotations
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 5886ba1..ed6d929 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -28,8 +28,8 @@ #include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_core.h> -static struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX] __read_mostly; -struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX] __read_mostly; +static struct nf_conntrack_l4proto __rcu **nf_ct_protos[PF_MAX] __read_mostly; +struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX] __read_mostly; EXPORT_SYMBOL_GPL(nf_ct_l3protos); static DEFINE_MUTEX(nf_ct_proto_mutex); |