From patchwork Fri Aug 28 22:05:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Vosburgh X-Patchwork-Id: 32476 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id DBBBCB7099 for ; Sat, 29 Aug 2009 08:05:35 +1000 (EST) Received: by ozlabs.org (Postfix) id CFA65DDDA2; Sat, 29 Aug 2009 08:05:35 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 573F7DDDA0 for ; Sat, 29 Aug 2009 08:05:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752844AbZH1WFX (ORCPT ); Fri, 28 Aug 2009 18:05:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751562AbZH1WFW (ORCPT ); Fri, 28 Aug 2009 18:05:22 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:49888 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513AbZH1WFV (ORCPT ); Fri, 28 Aug 2009 18:05:21 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e33.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id n7SM3MHi003086 for ; Fri, 28 Aug 2009 16:03:22 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n7SM5JTU044144 for ; Fri, 28 Aug 2009 16:05:20 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n7SM5J6X005627 for ; Fri, 28 Aug 2009 16:05:19 -0600 Received: from localhost.localdomain (sig-9-65-43-152.mts.ibm.com [9.65.43.152]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n7SM5FbU005325; Fri, 28 Aug 2009 16:05:18 -0600 From: Jay Vosburgh To: netdev@vger.kernel.org Cc: David Miller , Petri Gynther Subject: [PATCH REPOST net-next-2.6 4/4] bonding: Have bond_check_dev_link examine netif_running Date: Fri, 28 Aug 2009 15:05:15 -0700 Message-Id: <1251497115-16234-5-git-send-email-fubar@us.ibm.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1251497115-16234-4-git-send-email-fubar@us.ibm.com> References: <1251497115-16234-1-git-send-email-fubar@us.ibm.com> <1251497115-16234-2-git-send-email-fubar@us.ibm.com> <1251497115-16234-3-git-send-email-fubar@us.ibm.com> <1251497115-16234-4-git-send-email-fubar@us.ibm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petri Gynther bonding: Have bond_check_dev_link examine netif_running Some network devices do not call netif_carrier_off when they are set administratively down. Have the bonding link check function also inspect the netif_running state. Ignore netif_running if the bond_check_dev_link function is called with "reporting" set, as in that case it's inspecting the capabilities of the non-netif_carrier device driver. Signed-off-by: Petri Gynther Signed-off-by: Jay Vosburgh --- drivers/net/bonding/bond_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6b9f15b..7c0e0bd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -695,6 +695,9 @@ static int bond_check_dev_link(struct bonding *bond, struct ifreq ifr; struct mii_ioctl_data *mii; + if (!reporting && !netif_running(slave_dev)) + return 0; + if (bond->params.use_carrier) return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;