summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2008-01-18 01:25:00 +0100
committerJeff Garzik <jeff@garzik.org>2008-01-18 20:38:38 +0100
commit3b96c858fcb27120fcba222366180c3293393ccf (patch)
tree53309f366e2a66be42591dfd1ecc9ac34ed96202
parentbonding: fix locking during alb failover and slave removal (diff)
downloadlinux-3b96c858fcb27120fcba222366180c3293393ccf.tar.xz
linux-3b96c858fcb27120fcba222366180c3293393ccf.zip
bonding: release slaves when master removed via sysfs
Add a call to bond_release_all in the bonding netdev event handler for the master. This releases the slaves for the case of, e.g., "echo -bond0 > /sys/class/net/bonding_masters", which otherwise will spin forever waiting for references to be released. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/bonding/bond_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 77d004d3c554..3ede0a2e6860 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3401,9 +3401,7 @@ static int bond_master_netdev_event(unsigned long event, struct net_device *bond
case NETDEV_CHANGENAME:
return bond_event_changename(event_bond);
case NETDEV_UNREGISTER:
- /*
- * TODO: remove a bond from the list?
- */
+ bond_release_all(event_bond->dev);
break;
default:
break;