changeset 2163 | d6d49dcaf7a5 |
parent 2033 | b67eb5c26716 |
child 2206 | 983aa34ca11d |
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c Wed Nov 23 15:07:42 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.33-ethercat.c Wed Nov 23 15:11:07 2011 +0100 @@ -3468,7 +3468,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; }