diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-14 10:27:09 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:33:47 -0800 |
| commit | d6be19f41ab91acca04abdca61353245d57d9ffc (patch) | |
| tree | a6a774f72a4d8f8079651d3b7b026a43e56b95bf /drivers/net/3c59x.c | |
| parent | 497f51fc64d0bce7f1a40ebed20b2ba5090777a3 (diff) | |
| download | kernel_samsung_crespo-d6be19f41ab91acca04abdca61353245d57d9ffc.zip kernel_samsung_crespo-d6be19f41ab91acca04abdca61353245d57d9ffc.tar.gz kernel_samsung_crespo-d6be19f41ab91acca04abdca61353245d57d9ffc.tar.bz2 | |
3c59x: shorten timer period for slave devices
[ Upstream commit 3013dc0cceb9baaf25d5624034eeaa259bf99004 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 8cc2256..41afc40 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/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) |