Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Changed accidentally used & operator to &&.
authorFlorian Pose <fp@igh-essen.com>
Tue, 18 Jan 2011 16:44:22 +0100
changeset 2050 a3e59f2a8589
parent 2015 ce2fae4d3c4f
child 2051 3a066ec73fb2
Changed accidentally used & operator to &&.
devices/e1000/e1000_main-2.6.13-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.20-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.22-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.24-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.26-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.27-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e1000/e1000_main-2.6.13-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.13-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -2682,7 +2682,7 @@
 #ifdef CONFIG_E1000_NAPI
 	if (adapter->ecdev) {
 		for(i = 0; i < E1000_MAX_INTR; i++)
-			if(unlikely(!adapter->clean_rx(adapter, &work_done, 100) &
+			if(unlikely(!adapter->clean_rx(adapter, &work_done, 100) &&
 						!e1000_clean_tx_irq(adapter)))
 				break;
 	} else {
--- a/devices/e1000/e1000_main-2.6.20-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.20-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -3879,10 +3879,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
@@ -4017,10 +4017,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
--- a/devices/e1000/e1000_main-2.6.22-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.22-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -3860,10 +3860,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-							&ec_work_done, 100) &
+							&ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
@@ -3974,10 +3974,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
--- a/devices/e1000/e1000_main-2.6.24-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.24-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -3857,10 +3857,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
@@ -3973,10 +3973,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++)
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 #endif
 				break;
--- a/devices/e1000/e1000_main-2.6.26-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.26-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -3934,10 +3934,10 @@
 		for (i = 0; i < E1000_MAX_INTR; i++) {
 #ifdef CONFIG_E1000_NAPI
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                            &ec_work_done, 100) &
+                            &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 #else
-			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 #endif
 				break;
@@ -4045,10 +4045,10 @@
 			for (i = 0; i < E1000_MAX_INTR; i++) {
 #ifdef CONFIG_E1000_NAPI
 				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-		                    &ec_work_done, 100) &
+		                    &ec_work_done, 100) &&
 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 #else
-				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 #endif
 					break;
--- a/devices/e1000/e1000_main-2.6.27-ethercat.c	Fri Jan 14 13:31:30 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.27-ethercat.c	Tue Jan 18 16:44:22 2011 +0100
@@ -3891,7 +3891,7 @@
  		int i, ec_work_done = 0;
  		for (i = 0; i < E1000_MAX_INTR; i++) {
  			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-                             &ec_work_done, 100) &
+                             &ec_work_done, 100) &&
  						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  				break;
  			}
@@ -3975,7 +3975,7 @@
 		int i, ec_work_done = 0;
 		for (i = 0; i < E1000_MAX_INTR; i++) {
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-							&ec_work_done, 100) &
+							 &ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 				break;
 			}
etherlabmaster