---

yaml --- r: 287697 b: refs/heads/master c: 3013dc0 h: refs/heads/master i: 287695: 0b8dfb9 v: v3
git-mirror · Feb 14, 2012 · 1deba0b · 1deba0b
1 parent 68bc777
commit 1deba0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)