Commit 17d04500 authored Mar 18, 2009 by Jay Vosburgh Committed by David S. Miller Mar 18, 2009

bonding: Fix updating of speed/duplex changes



	This patch corrects an omission from the following commit:

commit f0c76d61
Author: Jay Vosburgh <fubar@us.ibm.com>
Date:   Wed Jul 2 18:21:58 2008 -0700

    bonding: refactor mii monitor

	The un-refactored code checked the link speed and duplex of
every slave on every pass; the refactored code did not do so.

	The 802.3ad and balance-alb/tlb modes utilize the speed and
duplex information, and require it to be kept up to date.  This patch
adds a notifier check to perform the appropriate updating when the slave
device speed changes.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 69010313

drivers/net/bonding/bond_main.c

+20 −5

Original line number	Diff line number	Diff line
		@@ -3537,11 +3537,26 @@ static int bond_slave_netdev_event(unsigned long event, struct net_device *slave
		}
		break;
		case NETDEV_CHANGE:
		/*
		* TODO: is this what we get if somebody
		* sets up a hierarchical bond, then rmmod's
		* one of the slave bonding devices?
		*/
		if (bond->params.mode == BOND_MODE_8023AD \|\| bond_is_lb(bond)) {
		struct slave *slave;

		slave = bond_get_slave_by_dev(bond, slave_dev);
		if (slave) {
		u16 old_speed = slave->speed;
		u16 old_duplex = slave->duplex;

		bond_update_speed_duplex(slave);

		if (bond_is_lb(bond))
		break;

		if (old_speed != slave->speed)
		bond_3ad_adapter_speed_changed(slave);
		if (old_duplex != slave->duplex)
		bond_3ad_adapter_duplex_changed(slave);
		}
		}

		break;
		case NETDEV_DOWN:
		/*

Admin message