From 1deba0ba7784630675df42d3e84c81a9bcb1c679 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 14 Feb 2012 10:27:09 +0000
Subject: [PATCH] --- yaml --- r: 287697 b: refs/heads/master c:
 3013dc0cceb9baaf25d5624034eeaa259bf99004 h: refs/heads/master i:   287695:
 0b8dfb94a0879be23f294c45629670996f6d4a3c v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/ethernet/3com/3c59x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38ffa2542176..bd8221e11fdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e05f357a039a94aa36475f8c110256f693a239
+refs/heads/master: 3013dc0cceb9baaf25d5624034eeaa259bf99004
diff --git a/trunk/drivers/net/ethernet/3com/3c59x.c b/trunk/drivers/net/ethernet/3com/3c59x.c
index 8153a3e0a1a4..f9b74c0a8492 100644
--- a/trunk/drivers/net/ethernet/3com/3c59x.c
+++ b/trunk/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)