Commit a59d3d21 authored Aug 28, 2013 by Veaceslav Falico Committed by David S. Miller Aug 29, 2013

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 <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>

parent 50223ce4

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",