Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixed accidentially used operator & by using &&.
authorFlorian Pose <fp@igh-essen.com>
Wed, 23 Nov 2011 15:11:07 +0100
changeset 2163 d6d49dcaf7a5
parent 2162 3f90ae16e997
child 2164 cf4db3c282d2
Fixed accidentially used operator & by using &&.
devices/e1000/e1000_main-2.6.29-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.31-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000/e1000_main-2.6.33-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e1000/e1000_main-2.6.29-ethercat.c	Wed Nov 23 15:07:42 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.29-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3766,7 +3766,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;
  			}
@@ -3850,7 +3850,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;
 			}
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c	Wed Nov 23 15:07:42 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.31-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3804,7 +3804,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;
 			}
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c	Wed Nov 23 15:07:42 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3468,7 +3468,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