Mercurial Mercurial > etherlabmaster / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
devices/e1000/e1000_main-2.6.22-ethercat.c
changeset 2050 a3e59f2a8589
parent 1325 16aacb421bd4
child 2421 bc2d4bf9cbe5
child 2589 2b9c78543663 
--- 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;
etherlabmaster