bonding: use vlan_uses_dev() in __bond_release_one()
authorVeaceslav Falico <vfalico@redhat.com>
Wed, 28 Aug 2013 21:25:12 +0000 (23:25 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Aug 2013 20:19:43 +0000 (16:19 -0400)
We always hold the rtnl_lock() in __bond_release_one(), so use
vlan_uses_dev() instead of bond_vlan_used().

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>
drivers/net/bonding/bond_main.c

index f38d59072572130fb0165ec239bdd9fd86130b02..55a48d32c1eca63624363b1c31eaa53fac30907f 100644 (file)
@@ -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",