diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-25 23:02:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-27 20:37:31 +0200 |
| commit | e0ad61ec867fdd262804afa7a68e11fc9930c2b9 (patch) | |
| tree | f59451cdfa2086757e55b18b87167b0fef3de2c1 /net/ipv6/protocol.c | |
| parent | ipv4: add __rcu annotations to routes.c (diff) | |
| download | linux-e0ad61ec867fdd262804afa7a68e11fc9930c2b9.tar.xz linux-e0ad61ec867fdd262804afa7a68e11fc9930c2b9.zip | |
net: add __rcu annotations to protocol
Add __rcu annotations to :
struct net_protocol *inet_protos
struct net_protocol *inet6_protos
And use appropriate casts to reduce sparse warnings if
CONFIG_SPARSE_RCU_POINTER=y
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/protocol.c')
| -rw-r--r-- | net/ipv6/protocol.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c index 9bb936ae2452..9a7978fdc02a 100644 --- a/net/ipv6/protocol.c +++ b/net/ipv6/protocol.c @@ -25,13 +25,14 @@ #include <linux/spinlock.h> #include <net/protocol.h> -const struct inet6_protocol *inet6_protos[MAX_INET_PROTOS] __read_mostly; +const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS] __read_mostly; int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol) { int hash = protocol & (MAX_INET_PROTOS - 1); - return !cmpxchg(&inet6_protos[hash], NULL, prot) ? 0 : -1; + return !cmpxchg((const struct inet6_protocol **)&inet6_protos[hash], + NULL, prot) ? 0 : -1; } EXPORT_SYMBOL(inet6_add_protocol); @@ -43,7 +44,8 @@ int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol { int ret, hash = protocol & (MAX_INET_PROTOS - 1); - ret = (cmpxchg(&inet6_protos[hash], prot, NULL) == prot) ? 0 : -1; + ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[hash], + prot, NULL) == prot) ? 0 : -1; synchronize_net(); |