[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200612042306.kB4N63Ki008001@shell0.pdx.osdl.net>
Date: Mon, 04 Dec 2006 15:04:54 -0800
From: akpm@...l.org
To: jeff@...zik.org
Cc: netdev@...r.kernel.org, akpm@...l.org, andy@...yhouse.net,
shemminger@...l.org
Subject: [patch 4/8] bonding: incorrect bonding state reported via ioctl
From: Andy Gospodarek <andy@...yhouse.net>
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@...yhouse.net>
Cc: Jeff Garzik <jeff@...zik.org>
Cc: Stephen Hemminger <shemminger@...l.org>
Signed-off-by: Andrew Morton <akpm@...l.org>
---
drivers/net/bonding/bond_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/bonding/bond_main.c~bonding-incorrect-bonding-state-reported-via-ioctl drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c~bonding-incorrect-bonding-state-reported-via-ioctl
+++ a/drivers/net/bonding/bond_main.c
@@ -3684,7 +3684,7 @@ static int bond_do_ioctl(struct net_devi
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);
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists