# HG changeset patch # User Florian Pose # Date 1382375808 -7200 # Node ID 193443bcd7dc09a365056ec21d2886f5986a004a # Parent f8b779c9794edceab56cfd0085bfb99970044745 Reset e100 watchdog only if link up. diff -r f8b779c9794e -r 193443bcd7dc 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); }