releases/3.0.23/3c59x-shorten-timer-period-for-slave-devices.patch

   1 From 883517479ee9727104b4ac4a3f8993355fdb2763 Mon Sep 17 00:00:00 2001
   2 From: Eric Dumazet <eric.dumazet@gmail.com>
   3 Date: Tue, 14 Feb 2012 10:27:09 +0000
   4 Subject: 3c59x: shorten timer period for slave devices
   5
   6
   7 From: Eric Dumazet <eric.dumazet@gmail.com>
   8
   9 [ Upstream commit 3013dc0cceb9baaf25d5624034eeaa259bf99004 ]
  10
  11 Jean Delvare reported bonding on top of 3c59x adapters was not detecting
  12 network cable removal fast enough.
  13
  14 3c59x indeed uses a 60 seconds timer to check link status if carrier is
  15 on, and 5 seconds if carrier is off.
  16
  17 This patch reduces timer period to 5 seconds if device is a bonding
  18 slave.
  19
  20 Reported-by: Jean Delvare <jdelvare@suse.de>
  21 Acked-by: Jean Delvare <jdelvare@suse.de>
  22 Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
  23 Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
  24 Signed-off-by: David S. Miller <davem@davemloft.net>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26 ---
  27  drivers/net/3c59x.c |    2 +-
  28  1 file changed, 1 insertion(+), 1 deletion(-)
  29
  30 --- a/drivers/net/3c59x.c
  31 +++ b/drivers/net/3c59x.c
  32 @@ -1842,7 +1842,7 @@ vortex_timer(unsigned long data)
  33                 ok = 1;
  34         }
  35
  36 -       if (!netif_carrier_ok(dev))
  37 +       if (dev->flags & IFF_SLAVE || !netif_carrier_ok(dev))
  38                 next_tick = 5*HZ;
  39
  40         if (vp->medialock)