branch | redundancy |
changeset 2318 | b0fe561ec7df |
parent 2313 | 7c5dded8e576 |
child 2211 | 2a009dc7bd1c |
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c Thu Dec 15 14:05:44 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; }