lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: use netdev_upper list in bond_vlan_used

Browse Source 
Convert bond_vlan_used() to traverse the upper device list to see if we
have any vlans above us. It's protected by rcu, and in case we are holding
rtnl_lock we should call vlan_uses_dev() instead - it's faster.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Veaceslav Falico
2013-08-28 23:25:09 +02:00
committed by David S. Miller
parent 8b5be8561b
commit c752af2c55
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/bonding/bonding.h
View File

@@ -267,9 +267,22 @@ struct bonding {
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
}; };
/* if we hold rtnl_lock() - call vlan_uses_dev() */
static inline bool bond_vlan_used(struct bonding *bond) static inline bool bond_vlan_used(struct bonding *bond)
{ {
return !list_empty(&bond->vlan_list); struct net_device *upper;
struct list_head *iter;
rcu_read_lock();
netdev_for_each_upper_dev_rcu(bond->dev, upper, iter) {
if (upper->priv_flags & IFF_802_1Q_VLAN) {
rcu_read_unlock();
return true;
}
}
rcu_read_unlock();
return false;
} }
#define bond_slave_get_rcu(dev) \ #define bond_slave_get_rcu(dev) \