From patchwork Tue Feb 14 20:27:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 141184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E5553B6F98 for ; Wed, 15 Feb 2012 07:27:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760733Ab2BNU1P (ORCPT ); Tue, 14 Feb 2012 15:27:15 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:40354 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757241Ab2BNU1O (ORCPT ); Tue, 14 Feb 2012 15:27:14 -0500 Received: by wics10 with SMTP id s10so89625wic.19 for ; Tue, 14 Feb 2012 12:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=ttUnkdXr0HrImRH5OXfOCJbbu79sY9ELee/8GjdzEnE=; b=WsGxelaxzt/VPDvForh/Cp6TSbnEeS4vKYnIiQ5NTXkQ3RhCjA/b8mB9emlOYtfvPE blBevS+rKpg+yMEFuym4xbOYboUz4kTgKq+SH2S+bEO2lTV4ynV2RMMARRw1SdRO0+m6 2V2sxbhMM00+2VziqVW6MDkw5Ew8c6nwA1jVg= Received: by 10.216.136.68 with SMTP id v46mr8386497wei.31.1329251232610; Tue, 14 Feb 2012 12:27:12 -0800 (PST) Received: from [192.168.1.97] (122.237.66.86.rev.sfr.net. [86.66.237.122]) by mx.google.com with ESMTPS id da8sm29166082wib.6.2012.02.14.12.27.10 (version=SSLv3 cipher=OTHER); Tue, 14 Feb 2012 12:27:11 -0800 (PST) Message-ID: <1329251229.2555.10.camel@edumazet-laptop> Subject: [PATCH] 3c59x: shorten timer period for slave devices From: Eric Dumazet To: David Miller Cc: klassert@mathematik.tu-chemnitz.de, jdelvare@suse.de, fubar@us.ibm.com, netdev@vger.kernel.org Date: Tue, 14 Feb 2012 21:27:09 +0100 In-Reply-To: <20120214.144335.558771219791311889.davem@davemloft.net> References: <1329218017.2336.5.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> <201202141350.57657.jdelvare@suse.de> <20120214133418.GJ32155@v3-1054> <20120214.144335.558771219791311889.davem@davemloft.net> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jean Delvare reported bonding on top of 3c59x adapters was not detecting network cable removal fast enough. 3c59x indeed uses a 60 seconds timer to check link status if carrier is on, and 5 seconds if carrier is off. This patch reduces timer period to 5 seconds if device is a bonding slave. Reported-by: Jean Delvare Acked-by: Jean Delvare Acked-by: Steffen Klassert Signed-off-by: Eric Dumazet --- drivers/net/ethernet/3com/3c59x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 1282f04..e463d10 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -1841,7 +1841,7 @@ vortex_timer(unsigned long data) ok = 1; } - if (!netif_carrier_ok(dev)) + if (dev->flags & IFF_SLAVE || !netif_carrier_ok(dev)) next_tick = 5*HZ; if (vp->medialock)