[patch 06/50] bonding: incorrect bonding state reported via ioctl
-stable review patch. If anyone has any objections, please let us know. -- From: Andy Gospodarek <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Cc: Jeff Garzik <[EMAIL PROTECTED]> Cc: Stephen Hemminger <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]> Signed-off-by: Chris Wright <[EMAIL PROTECTED]> --- drivers/net/bonding/bond_main.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.19.1.orig/drivers/net/bonding/bond_main.c +++ linux-2.6.19.1/drivers/net/bonding/bond_main.c @@ -3675,7 +3675,7 @@ static int bond_do_ioctl(struct net_devi mii->val_out = 0; read_lock_bh(>lock); read_lock(>curr_slave_lock); - if (bond->curr_active_slave) { + if (netif_carrier_ok(bond->dev)) { mii->val_out = BMSR_LSTATUS; } read_unlock(>curr_slave_lock); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[patch 06/50] bonding: incorrect bonding state reported via ioctl
-stable review patch. If anyone has any objections, please let us know. -- From: Andy Gospodarek [EMAIL PROTECTED] 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 [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Stephen Hemminger [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Signed-off-by: Jeff Garzik [EMAIL PROTECTED] Signed-off-by: Chris Wright [EMAIL PROTECTED] --- drivers/net/bonding/bond_main.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.19.1.orig/drivers/net/bonding/bond_main.c +++ linux-2.6.19.1/drivers/net/bonding/bond_main.c @@ -3675,7 +3675,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 linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/