diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-14 10:27:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-14 16:28:23 -0500 |
| commit | 3013dc0cceb9baaf25d5624034eeaa259bf99004 (patch) | |
| tree | 2e02935bf2ddbcfc3f398484228b146000ef8eb9 /drivers/net/ethernet/3com | |
| parent | 58e05f357a039a94aa36475f8c110256f693a239 (diff) | |
| download | blackbird-op-linux-3013dc0cceb9baaf25d5624034eeaa259bf99004.tar.gz blackbird-op-linux-3013dc0cceb9baaf25d5624034eeaa259bf99004.zip | |
3c59x: shorten timer period for slave devices
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/3com')
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 8153a3e0a1a4..f9b74c0a8492 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -1842,7 +1842,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) |
