evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vlan: remove usage of dev->master in __vlan_find_dev_deep()

Browse source 
Also, since all users call __vlan_find_dev_deep() with rcu_read_lock,
make no possibility to call this with rtnl mutex held only.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2013-01-03 22:48:59 +00:00 • committed by David S. Miller
parent 0347af510c
commit 1cdfd72f79
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/8021q/vlan_core.c
View file

@ -60,21 +60,25 @@ bool vlan_do_receive(struct sk_buff **skbp)
return true; return true;
} }
/* Must be invoked with rcu_read_lock or with RTNL. */ /* Must be invoked with rcu_read_lock. */
struct net_device *__vlan_find_dev_deep(struct net_device *real_dev, struct net_device *__vlan_find_dev_deep(struct net_device *dev,
u16 vlan_id) u16 vlan_id)
{ {
struct vlan_info *vlan_info = rcu_dereference_rtnl(real_dev->vlan_info); struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info);
if (vlan_info) { if (vlan_info) {
return vlan_group_get_device(&vlan_info->grp, vlan_id); return vlan_group_get_device(&vlan_info->grp, vlan_id);
} else { } else {
/* /*
* Bonding slaves do not have grp assigned to themselves. * Lower devices of master uppers (bonding, team) do not have
* Grp is assigned to bonding master instead. * grp assigned to themselves. Grp is assigned to upper device
* instead.
*/ */
if (netif_is_bond_slave(real_dev)) struct net_device *upper_dev;
return __vlan_find_dev_deep(real_dev->master, vlan_id);
upper_dev = netdev_master_upper_dev_get_rcu(dev);
if (upper_dev)
return __vlan_find_dev_deep(upper_dev, vlan_id);
} }
return NULL; return NULL;