diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-24 21:32:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-25 13:09:43 -0700 |
| commit | 198caeca3eb4c81bbdbeb34a870868002f89b3d2 (patch) | |
| tree | ac2c01e12b71c3a88a8b2d6b86151b618878af1a | |
| parent | b616b09afabf6d569aa31176aa86f05d2586de3e (diff) | |
| download | linux-198caeca3eb4c81bbdbeb34a870868002f89b3d2.tar.bz2 | |
ipv6: ip6_ptr rcu annotations
(struct net_device)->ip6_ptr is rcu protected :
add __rcu annotation and proper rcu primitives.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | net/core/dev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ceefb441c236..4722d4a9b58f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -952,7 +952,7 @@ struct net_device { void *atalk_ptr; /* AppleTalk link */ struct in_device __rcu *ip_ptr; /* IPv4 specific data */ void *dn_ptr; /* DECnet specific data */ - void *ip6_ptr; /* IPv6 specific data */ + struct inet6_dev __rcu *ip6_ptr; /* IPv6 specific data */ void *ec_ptr; /* Econet specific data */ void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, diff --git a/net/core/dev.c b/net/core/dev.c index 2c7da3ab4684..365f7f5077e4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5416,7 +5416,7 @@ void netdev_run_todo(void) /* paranoia */ BUG_ON(netdev_refcnt_read(dev)); WARN_ON(rcu_dereference_raw(dev->ip_ptr)); - WARN_ON(dev->ip6_ptr); + WARN_ON(rcu_dereference_raw(dev->ip6_ptr)); WARN_ON(dev->dn_ptr); if (dev->destructor) |