diff options
| author |   Veaceslav Falico <vfalico@redhat.com> | 2013-08-28 23:25:12 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-08-29 16:19:43 -0400 |
| commit | a59d3d21ea7636d4cc7fb921104b9b4a59196839 (patch) | |
| tree | 80e7a1ace6d5b75fcbba6cc22a19f23eca5ecf6f /drivers | |
| parent | bonding: convert bond_has_this_ip() to use upper devices (diff) | |
| download | linux-dev-a59d3d21ea7636d4cc7fb921104b9b4a59196839.tar.xz linux-dev-a59d3d21ea7636d4cc7fb921104b9b4a59196839.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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", |