aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorVeaceslav Falico <vfalico@redhat.com>2013-09-25 03:20:15 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-26 16:02:05 -0400
commit544a028e65a9dadc13c3d12fb009b4bcd5338a9f (patch)
tree251c816033b17a9b6a2e0c8fb9429e96d48b043f /drivers/net/bonding/bond_main.c
parent9caff1e7b761c28018bf1858f6661439b4055f51 (diff)
bonding: use bond_for_each_slave() in bond_uninit()
We're safe agains removal there, cause we use neighbours primitives. 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/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9064e24de35a..85e99aedabb1 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4090,12 +4090,13 @@ static void bond_setup(struct net_device *bond_dev)
4090static void bond_uninit(struct net_device *bond_dev) 4090static void bond_uninit(struct net_device *bond_dev)
4091{ 4091{
4092 struct bonding *bond = netdev_priv(bond_dev); 4092 struct bonding *bond = netdev_priv(bond_dev);
4093 struct slave *slave, *tmp_slave; 4093 struct list_head *iter;
4094 struct slave *slave;
4094 4095
4095 bond_netpoll_cleanup(bond_dev); 4096 bond_netpoll_cleanup(bond_dev);
4096 4097
4097 /* Release the bonded slaves */ 4098 /* Release the bonded slaves */
4098 list_for_each_entry_safe(slave, tmp_slave, &bond->slave_list, list) 4099 bond_for_each_slave(bond, slave, iter)
4099 __bond_release_one(bond_dev, slave->dev, true); 4100 __bond_release_one(bond_dev, slave->dev, true);
4100 pr_info("%s: released all slaves\n", bond_dev->name); 4101 pr_info("%s: released all slaves\n", bond_dev->name);
4101 4102