This is a note to let you know that I've just added the patch titled

    3c59x: shorten timer period for slave devices

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     3c59x-shorten-timer-period-for-slave-devices.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 883517479ee9727104b4ac4a3f8993355fdb2763 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <[email protected]>
Date: Tue, 14 Feb 2012 10:27:09 +0000
Subject: 3c59x: shorten timer period for slave devices


From: Eric Dumazet <[email protected]>

[ 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 <[email protected]>
Acked-by: Jean Delvare <[email protected]>
Acked-by: Steffen Klassert <[email protected]>
Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/net/3c59x.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 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)


Patches currently in stable-queue which might be from [email protected] are

queue-3.0/ipv4-fix-redirect-handling.patch
queue-3.0/gro-more-generic-l2-header-check.patch
queue-3.0/netpoll-netpoll_poll_dev-should-access-dev-flags.patch
queue-3.0/3c59x-shorten-timer-period-for-slave-devices.patch
queue-3.0/ipv4-reset-flowi-parameters-on-route-connect.patch
queue-3.0/tcp_v4_send_reset-binding-oif-to-iif-in-no-sock-case.patch
queue-3.0/net_sched-bug-in-netem-reordering.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to