Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixed repeating e1000e reset while link down, thanks to J. Kunz. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Tue, 05 Feb 2013 13:56:29 +0100
branchstable-1.5
changeset 2500 97fd83907c7c
parent 2499 c350fc89afd7
child 2501 64cdc3b59d25
Fixed repeating e1000e reset while link down, thanks to J. Kunz.
devices/e1000e/netdev-2.6.32-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.33-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.34-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.35-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.37-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-3.2-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-3.4-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e1000e/netdev-2.6.32-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-2.6.32-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -3810,8 +3810,7 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
--- a/devices/e1000e/netdev-2.6.33-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-2.6.33-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -3799,8 +3799,7 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
--- a/devices/e1000e/netdev-2.6.34-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-2.6.34-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -3775,8 +3775,7 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
--- a/devices/e1000e/netdev-2.6.35-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-2.6.35-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -4192,8 +4192,7 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
--- a/devices/e1000e/netdev-2.6.37-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-2.6.37-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -4382,8 +4382,7 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
--- a/devices/e1000e/netdev-3.2-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-3.2-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -4546,9 +4546,8 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
-	    	(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev) &&
+		(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
 		/*
 		 * We've lost link, so the controller stops DMA,
 		 * but we've got queued Tx work that's never going
--- a/devices/e1000e/netdev-3.4-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-3.4-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -4681,9 +4681,8 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
-	    	(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev) &&
+		(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
 		/*
 		 * We've lost link, so the controller stops DMA,
 		 * but we've got queued Tx work that's never going
etherlabmaster