Reset e100 watchdog only if link up. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Mon, 21 Oct 2013 19:16:48 +0200
branchstable-1.5
changeset 2531 193443bcd7dc
parent 2530 f8b779c9794e
child 2532 bdadf6da4914
Reset e100 watchdog only if link up.
devices/e100-3.4-ethercat.c
--- a/devices/e100-3.4-ethercat.c	Tue May 21 13:18:24 2013 +0200
+++ b/devices/e100-3.4-ethercat.c	Mon Oct 21 19:16:48 2013 +0200
@@ -2122,7 +2122,9 @@
 
 			// No need to detect link status as
 			// long as frames are received: Reset watchdog.
-			nic->ec_watchdog_jiffies = jiffies;
+			if (ecdev_get_link(nic->ecdev)) {
+				nic->ec_watchdog_jiffies = jiffies;
+			}
 		} else {
 			netif_receive_skb(skb);
 		}