Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
merge stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Fri, 18 Dec 2015 12:30:45 +0100
branchstable-1.5
changeset 2632 08aa7305b9ba
parent 2599 4b0b906df1b4 (diff)
parent 2631 827abf3c50de (current diff)
child 2639 3bedfc5ecd74
merge 
--- 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) &&
--- 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) &&
--- 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) &&
--- 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) &&
--- 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) &&
etherlabmaster