Skip to content

Commit

Permalink
vlan: rcu annotations
Browse files Browse the repository at this point in the history
(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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Oct 25, 2010
1 parent 5202e17 commit b616b09
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ struct net_device {
/* Protocol specific pointers */

#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
struct vlan_group *vlgrp; /* VLAN group */
struct vlan_group __rcu *vlgrp; /* VLAN group */
#endif
#ifdef CONFIG_NET_DSA
void *dsa_ptr; /* dsa specific data */
Expand Down
6 changes: 3 additions & 3 deletions net/8021q/vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit b616b09

Please sign in to comment.