devices/e1000/e1000_main-2.6.27-ethercat.c
changeset 2050 a3e59f2a8589
parent 1900 25f848e2fbf4
child 2252 6001f50617a7
--- 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;
 			}