Commit 4e140079 authored Dec 04, 2006 by Andy Gospodarek Committed by Jeff Garzik Dec 04, 2006

[PATCH] bonding: incorrect bonding state reported via ioctl

This is a small fix-up to finish out the work done by Jay Vosburgh to add
carrier-state support for bonding devices.  The output in
/proc/net/bonding/bondX was correct, but when collecting the same info via
an iotcl it could still be incorrect.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 33fee56a

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3684,7 +3684,7 @@ static int bond_do_ioctl(struct net_device bond_dev, struct ifreq ifr, int cmd
		mii->val_out = 0;
		read_lock_bh(&bond->lock);
		read_lock(&bond->curr_slave_lock);
		if (bond->curr_active_slave) {
		if (netif_carrier_ok(bond->dev)) {
		mii->val_out = BMSR_LSTATUS;
		}
		read_unlock(&bond->curr_slave_lock);

Admin message