Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixed bug concerning netdev_completed_queue(); thanks to B. Benner. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Thu, 19 Feb 2015 15:19:29 +0100
branchstable-1.5
changeset 2599 4b0b906df1b4
parent 2588 792892ab4806
child 2632 08aa7305b9ba
child 2636 0613017547fe
Fixed bug concerning netdev_completed_queue(); thanks to B. Benner.
devices/e1000/e1000_main-3.10-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-3.12-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-3.14-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-3.16-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-3.8-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e1000/e1000_main-3.10-ethercat.c	Tue Oct 28 16:54:59 2014 +0100
+++ b/devices/e1000/e1000_main-3.10-ethercat.c	Thu Feb 19 15:19:29 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	Tue Oct 28 16:54:59 2014 +0100
+++ b/devices/e1000/e1000_main-3.12-ethercat.c	Thu Feb 19 15:19:29 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	Tue Oct 28 16:54:59 2014 +0100
+++ b/devices/e1000/e1000_main-3.14-ethercat.c	Thu Feb 19 15:19:29 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	Tue Oct 28 16:54:59 2014 +0100
+++ b/devices/e1000/e1000_main-3.16-ethercat.c	Thu Feb 19 15:19:29 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	Tue Oct 28 16:54:59 2014 +0100
+++ b/devices/e1000/e1000_main-3.8-ethercat.c	Thu Feb 19 15:19:29 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