# HG changeset patch
# User Gavin Lambert <gavinl@compacsort.com>
# Parent 4727e0b426ee4b1feea142485d947ca8a585bb49
RX does not reset watchdog (breaks redundancy).

diff -r 4727e0b426ee devices/e1000e/netdev-2.6.32-ethercat.c
--- a/devices/e1000e/netdev-2.6.32-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-2.6.32-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -551,7 +551,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
 		}
@@ -878,7 +877,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1068,7 +1066,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, status,
 			                  rx_desc->special);
diff -r 4727e0b426ee devices/e1000e/netdev-2.6.33-ethercat.c
--- a/devices/e1000e/netdev-2.6.33-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-2.6.33-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -519,7 +519,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
 		}
@@ -879,7 +878,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1069,7 +1067,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, status,
 			                  rx_desc->special);
diff -r 4727e0b426ee devices/e1000e/netdev-2.6.34-ethercat.c
--- a/devices/e1000e/netdev-2.6.34-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-2.6.34-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -520,7 +520,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
 		}
@@ -877,7 +876,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1067,7 +1065,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, status,
 			                  rx_desc->special);
diff -r 4727e0b426ee devices/e1000e/netdev-2.6.35-ethercat.c
--- a/devices/e1000e/netdev-2.6.35-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-2.6.35-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -869,7 +869,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
 		}
@@ -1221,7 +1220,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1412,7 +1410,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, status,
 			                  rx_desc->special);
diff -r 4727e0b426ee devices/e1000e/netdev-2.6.37-ethercat.c
--- a/devices/e1000e/netdev-2.6.37-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-2.6.37-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -877,7 +877,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
 		}
@@ -1226,7 +1225,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1417,7 +1415,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, status,
 			                  rx_desc->special);
@@ -5769,7 +5766,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.10-ethercat.c
--- a/devices/e1000e/netdev-3.10-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.10-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -1022,7 +1022,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1450,7 +1449,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					rx_desc->wb.middle.vlan);
@@ -1641,7 +1639,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6619,7 +6616,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.12-ethercat.c
--- a/devices/e1000e/netdev-3.12-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.12-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -1020,7 +1020,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1448,7 +1447,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					rx_desc->wb.middle.vlan);
@@ -1639,7 +1637,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6671,7 +6668,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.14-ethercat.c
--- a/devices/e1000e/netdev-3.14-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.14-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -1020,7 +1020,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1448,7 +1447,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					rx_desc->wb.middle.vlan);
@@ -1639,7 +1637,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6679,7 +6676,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.16-ethercat.c
--- a/devices/e1000e/netdev-3.16-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.16-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -1045,7 +1045,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1488,7 +1487,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					rx_desc->wb.middle.vlan);
@@ -1679,7 +1677,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6829,7 +6826,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.2-ethercat.c
--- a/devices/e1000e/netdev-3.2-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.2-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -982,7 +982,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1354,7 +1353,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1541,7 +1539,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6051,7 +6048,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.4-ethercat.c
--- a/devices/e1000e/netdev-3.4-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.4-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -977,7 +977,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1381,7 +1380,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1567,7 +1565,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6205,7 +6202,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.6-ethercat.c
--- a/devices/e1000e/netdev-3.6-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.6-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -969,7 +969,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1378,7 +1377,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1564,7 +1562,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6224,7 +6221,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}
 
diff -r 4727e0b426ee devices/e1000e/netdev-3.8-ethercat.c
--- a/devices/e1000e/netdev-3.8-ethercat.c	Tue Mar 17 16:18:54 2015 +1300
+++ b/devices/e1000e/netdev-3.8-ethercat.c	Tue Mar 17 17:00:49 2015 +1300
@@ -968,7 +968,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 		    e1000_receive_skb(adapter, netdev, skb, staterr,
 				      rx_desc->wb.upper.vlan);
@@ -1371,7 +1370,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb,
 					  staterr, rx_desc->wb.middle.vlan);
@@ -1560,7 +1558,6 @@
 
 		if (adapter->ecdev) {
 			ecdev_receive(adapter->ecdev, skb->data, length);
-			adapter->ec_watchdog_jiffies = jiffies;
 		} else {
 			e1000_receive_skb(adapter, netdev, skb, staterr,
 					  rx_desc->wb.upper.vlan);
@@ -6162,7 +6159,7 @@
 	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
 		struct e1000_hw *hw = &adapter->hw;
 		hw->mac.get_link_status = true;
-		e1000_watchdog_task(&adapter->watchdog_task);
+		e1000_watchdog((unsigned long) adapter);
 		adapter->ec_watchdog_jiffies = jiffies;
 	}