From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751096AbXAFC2Y (ORCPT ); Fri, 5 Jan 2007 21:28:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751113AbXAFC2Y (ORCPT ); Fri, 5 Jan 2007 21:28:24 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:47977 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108AbXAFC2I (ORCPT ); Fri, 5 Jan 2007 21:28:08 -0500 Message-Id: <20070106022956.081561000@sous-sol.org> References: <20070106022753.334962000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Fri, 05 Jan 2007 18:27:59 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Andy Gospodarek , fubar@us.ibm.com, ctindel@users.sourceforge.net, Jeff Garzik , Stephen Hemminger Subject: [patch 06/50] bonding: incorrect bonding state reported via ioctl Content-Disposition: inline; filename=bonding-incorrect-bonding-state-reported-via-ioctl.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Andy Gospodarek 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 Cc: Jeff Garzik Cc: Stephen Hemminger Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik Signed-off-by: Chris Wright --- 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); --