From ce32c9153e1d1e8a0fc8ae712459a479b1398abf Mon Sep 17 00:00:00 2001 From: jamal Date: Fri, 22 Sep 2006 21:54:37 -0700 Subject: [PATCH] --- yaml --- r: 36505 b: refs/heads/master c: 70298705bb29fb7982b85089adf17cd37b94baa7 h: refs/heads/master i: 36503: b55946edb5562454c8fbbced6c3ed55dc5497faf v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52ef292ec7f0..7840e3bde036 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b680e753724d31a9c45f059d1aad29df54584a1 +refs/heads/master: 70298705bb29fb7982b85089adf17cd37b94baa7 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 9e5a533a1622..bafe62f7c9b7 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -3430,7 +3430,6 @@ static int bond_close(struct net_device *bond_dev) write_lock_bh(&bond->lock); - bond_mc_list_destroy(bond); /* signal timers not to re-arm */ bond->kill_timers = 1; @@ -3461,8 +3460,6 @@ static int bond_close(struct net_device *bond_dev) break; } - /* Release the bonded slaves */ - bond_release_all(bond_dev); if ((bond->params.mode == BOND_MODE_TLB) || (bond->params.mode == BOND_MODE_ALB)) { @@ -4248,6 +4245,9 @@ static void bond_free_all(void) list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list) { struct net_device *bond_dev = bond->dev; + bond_mc_list_destroy(bond); + /* Release the bonded slaves */ + bond_release_all(bond_dev); unregister_netdevice(bond_dev); bond_deinit(bond_dev); }