diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-24 21:31:58 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-25 13:09:43 -0700 |
| commit | b616b09afabf6d569aa31176aa86f05d2586de3e (patch) | |
| tree | 9765278f9825a612c27fea34aba0c614594b88c5 /net/8021q/vlan.c | |
| parent | tms380tr: Use mdelay() in tms380tr_wait(). (diff) | |
| download | linux-dev-b616b09afabf6d569aa31176aa86f05d2586de3e.tar.xz linux-dev-b616b09afabf6d569aa31176aa86f05d2586de3e.zip | |
vlan: rcu annotations
(struct net_device)->vlgrp 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>
Diffstat (limited to '')
| -rw-r--r-- | net/8021q/vlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 05b867e43757..52077ca22072 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -112,7 +112,7 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) ASSERT_RTNL(); - grp = real_dev->vlgrp; + grp = rtnl_dereference(real_dev->vlgrp); BUG_ON(!grp); /* Take it out of our own structures, but be sure to interlock with @@ -177,7 +177,7 @@ int register_vlan_dev(struct net_device *dev) struct vlan_group *grp, *ngrp = NULL; int err; - grp = real_dev->vlgrp; + grp = rtnl_dereference(real_dev->vlgrp); if (!grp) { ngrp = grp = vlan_group_alloc(real_dev); if (!grp) @@ -385,7 +385,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, dev->netdev_ops->ndo_vlan_rx_add_vid(dev, 0); } - grp = dev->vlgrp; + grp = rtnl_dereference(dev->vlgrp); if (!grp) goto out; |