From: Veaceslav Falico Date: Wed, 28 Aug 2013 21:25:12 +0000 (+0200) Subject: bonding: use vlan_uses_dev() in __bond_release_one() X-Git-Tag: MMI-PSA29.97-13-9~13727^2~151^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a59d3d21ea7636d4cc7fb921104b9b4a59196839;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git bonding: use vlan_uses_dev() in __bond_release_one() We always hold the rtnl_lock() in __bond_release_one(), so use vlan_uses_dev() instead of bond_vlan_used(). CC: Jay Vosburgh CC: Andy Gospodarek Signed-off-by: Veaceslav Falico Signed-off-by: David S. Miller --- diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f38d59072572..55a48d32c1ec 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1954,7 +1954,7 @@ static int __bond_release_one(struct net_device *bond_dev, bond_set_carrier(bond); eth_hw_addr_random(bond_dev); - if (bond_vlan_used(bond)) { + if (vlan_uses_dev(bond_dev)) { pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n", bond_dev->name, bond_dev->name); pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",