--- 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;