Netdev List
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: klassert@mathematik.tu-chemnitz.de, jdelvare@suse.de,
	fubar@us.ibm.com, netdev@vger.kernel.org
Subject: [PATCH] 3c59x: shorten timer period for slave devices
Date: Tue, 14 Feb 2012 21:27:09 +0100	[thread overview]
Message-ID: <1329251229.2555.10.camel@edumazet-laptop> (raw)
In-Reply-To: <20120214.144335.558771219791311889.davem@davemloft.net>

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 <jdelvare@suse.de>
Acked-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 drivers/net/ethernet/3com/3c59x.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

  reply	other threads:[~2012-02-14 20:27 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-13 21:53 bonding with 3c59x driver Jean Delvare
2012-02-13 22:13 ` Jay Vosburgh
2012-02-14 10:22   ` Jean Delvare
2012-02-14 10:35     ` Steffen Klassert
2012-02-14 10:44     ` David Laight
2012-02-14 11:06     ` Steffen Klassert
2012-02-14 11:13       ` Eric Dumazet
2012-02-14 12:50         ` Jean Delvare
2012-02-14 13:34           ` Steffen Klassert
2012-02-14 19:43             ` David Miller
2012-02-14 20:27               ` Eric Dumazet [this message]
2012-02-14 20:51                 ` [PATCH] 3c59x: shorten timer period for slave devices Dan Williams
2012-02-14 21:02                   ` Eric Dumazet
2012-02-14 21:28                     ` David Miller
2012-02-14 18:27         ` bonding with 3c59x driver Rick Jones
2012-02-14 19:27           ` Jean Delvare
2012-02-14 21:06             ` Chris Friesen
2012-02-15  9:53               ` Jean Delvare

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329251229.2555.10.camel@edumazet-laptop \
    --to=eric.dumazet@gmail.com \
    --cc=davem@davemloft.net \
    --cc=fubar@us.ibm.com \
    --cc=jdelvare@suse.de \
    --cc=klassert@mathematik.tu-chemnitz.de \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox