# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1450438245 -3600
# Node ID 08aa7305b9baba37bdd9eb4d8c2a8762aa56a7e2
# Parent  4b0b906df1b40a1b5610282117b2c22581890575# Parent  827abf3c50de5d7d523f7bcfa5ed5e50b4f1b130
merge

diff -r 827abf3c50de -r 08aa7305b9ba devices/e1000/e1000_main-3.10-ethercat.c
--- a/devices/e1000/e1000_main-3.10-ethercat.c	Thu May 07 15:53:42 2015 +0200
+++ b/devices/e1000/e1000_main-3.10-ethercat.c	Fri Dec 18 12:30:45 2015 +0100
@@ -4004,7 +4004,9 @@
 
 	tx_ring->next_to_clean = i;
 
-	netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	if (!adapter->ecdev) {
+		netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	}
 
 #define TX_WAKE_THRESHOLD 32
 	if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&
diff -r 827abf3c50de -r 08aa7305b9ba devices/e1000/e1000_main-3.12-ethercat.c
--- a/devices/e1000/e1000_main-3.12-ethercat.c	Thu May 07 15:53:42 2015 +0200
+++ b/devices/e1000/e1000_main-3.12-ethercat.c	Fri Dec 18 12:30:45 2015 +0100
@@ -4004,7 +4004,9 @@
 
 	tx_ring->next_to_clean = i;
 
-	netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	if (!adapter->ecdev) {
+		netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	}
 
 #define TX_WAKE_THRESHOLD 32
 	if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&
diff -r 827abf3c50de -r 08aa7305b9ba devices/e1000/e1000_main-3.14-ethercat.c
--- a/devices/e1000/e1000_main-3.14-ethercat.c	Thu May 07 15:53:42 2015 +0200
+++ b/devices/e1000/e1000_main-3.14-ethercat.c	Fri Dec 18 12:30:45 2015 +0100
@@ -3982,7 +3982,9 @@
 
 	tx_ring->next_to_clean = i;
 
-	netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	if (!adapter->ecdev) {
+		netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	}
 
 #define TX_WAKE_THRESHOLD 32
 	if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&
diff -r 827abf3c50de -r 08aa7305b9ba devices/e1000/e1000_main-3.16-ethercat.c
--- a/devices/e1000/e1000_main-3.16-ethercat.c	Thu May 07 15:53:42 2015 +0200
+++ b/devices/e1000/e1000_main-3.16-ethercat.c	Fri Dec 18 12:30:45 2015 +0100
@@ -3974,7 +3974,9 @@
 
 	tx_ring->next_to_clean = i;
 
-	netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	if (!adapter->ecdev) {
+		netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	}
 
 #define TX_WAKE_THRESHOLD 32
 	if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&
diff -r 827abf3c50de -r 08aa7305b9ba devices/e1000/e1000_main-3.8-ethercat.c
--- a/devices/e1000/e1000_main-3.8-ethercat.c	Thu May 07 15:53:42 2015 +0200
+++ b/devices/e1000/e1000_main-3.8-ethercat.c	Fri Dec 18 12:30:45 2015 +0100
@@ -4023,7 +4023,9 @@
 
 	tx_ring->next_to_clean = i;
 
-	netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	if (!adapter->ecdev) {
+		netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+	}
 
 #define TX_WAKE_THRESHOLD 32
 	if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&