Fixed e1000 link detection race.
authorFlorian Pose <fp@igh-essen.com>
Mon, 09 Jan 2012 10:28:36 +0100
changeset 2209 b6c4c8940d0a
parent 2208 5c14d0512362
child 2210 353c285b5ff7
Fixed e1000 link detection race.
devices/e1000/e1000_main-2.6.33-ethercat.c
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c	Mon Jan 09 10:25:30 2012 +0100
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c	Mon Jan 09 10:28:36 2012 +0100
@@ -3460,7 +3460,7 @@
 	if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
 		hw->get_link_status = 1;
 		/* guard against interrupt when we're going down */
-		if (!test_bit(__E1000_DOWN, &adapter->flags))
+		if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->flags))
 			mod_timer(&adapter->watchdog_timer, jiffies + 1);
 	}