Commit 70298705 authored Sep 22, 2006 by jamal Committed by Jeff Garzik Sep 25, 2006

[PATCH] bonding: Don't release slaves when master is admin down



When a bonding netdevice is admin-ed down it loses the slaves
attributes (set via ifenslave). This is not consistent with other
behavior of netdevices (example a qdisc attached to a netdevice doesnt
disappear or an attached IP address etc).
The included patch fixes this. Ive tested by ifenslaving, downing the
bond, checking /proc and making sure it still has the slaves, up-ing the
bond and making sure things continue to work.

Jay/Bonding folks if you are ok with it, just ACK it or include it in
your tree etc. Otherwise we can discuss.

Acked-by: Jay Vosburgh <fubar@us.ibm.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 0b680e75

drivers/net/bonding/bond_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}