diff -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.26-ethercat.c --- 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;