diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2013-09-25 07:20:15 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-26 20:02:05 (GMT) |
| commit | 544a028e65a9dadc13c3d12fb009b4bcd5338a9f (patch) | |
| tree | 251c816033b17a9b6a2e0c8fb9429e96d48b043f /drivers/net/bonding/bond_main.c | |
| parent | 9caff1e7b761c28018bf1858f6661439b4055f51 (diff) | |
| download | linux-fsl-qoriq-544a028e65a9dadc13c3d12fb009b4bcd5338a9f.tar.xz | |
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9064e24..85e99ae 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) static void bond_uninit(struct net_device *bond_dev) { struct bonding *bond = netdev_priv(bond_dev); - struct slave *slave, *tmp_slave; + struct list_head *iter; + struct slave *slave; bond_netpoll_cleanup(bond_dev); /* Release the bonded slaves */ - list_for_each_entry_safe(slave, tmp_slave, &bond->slave_list, list) + bond_for_each_slave(bond, slave, iter) __bond_release_one(bond_dev, slave->dev, true); pr_info("%s: released all slaves\n", bond_dev->name); |