diff --git a/devices/e1000/e1000_main-2.6.13-ethercat.c b/devices/e1000/e1000_main-2.6.13-ethercat.c index 430d7c04..ad8afd47 100644 --- a/devices/e1000/e1000_main-2.6.13-ethercat.c +++ b/devices/e1000/e1000_main-2.6.13-ethercat.c @@ -2682,7 +2682,7 @@ e1000_intr(int irq, void *data, struct pt_regs *regs) #ifdef CONFIG_E1000_NAPI if (adapter->ecdev) { for(i = 0; i < E1000_MAX_INTR; i++) - if(unlikely(!adapter->clean_rx(adapter, &work_done, 100) & + if(unlikely(!adapter->clean_rx(adapter, &work_done, 100) && !e1000_clean_tx_irq(adapter))) break; } else { diff --git a/devices/e1000/e1000_main-2.6.20-ethercat.c b/devices/e1000/e1000_main-2.6.20-ethercat.c index 3d19274d..55c14727 100644 --- a/devices/e1000/e1000_main-2.6.20-ethercat.c +++ b/devices/e1000/e1000_main-2.6.20-ethercat.c @@ -3879,10 +3879,10 @@ irqreturn_t e1000_intr_msi(int irq, void *data) 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 @@ e1000_intr(int irq, void *data) 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; diff --git a/devices/e1000/e1000_main-2.6.22-ethercat.c b/devices/e1000/e1000_main-2.6.22-ethercat.c index 6ccb16f9..dab84193 100644 --- a/devices/e1000/e1000_main-2.6.22-ethercat.c +++ b/devices/e1000/e1000_main-2.6.22-ethercat.c @@ -3860,10 +3860,10 @@ e1000_intr_msi(int irq, void *data) 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 @@ e1000_intr(int irq, void *data) 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; diff --git a/devices/e1000/e1000_main-2.6.24-ethercat.c b/devices/e1000/e1000_main-2.6.24-ethercat.c index d17cb822..c779ab98 100644 --- a/devices/e1000/e1000_main-2.6.24-ethercat.c +++ b/devices/e1000/e1000_main-2.6.24-ethercat.c @@ -3857,10 +3857,10 @@ e1000_intr_msi(int irq, void *data) 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; @@ -3973,10 +3973,10 @@ e1000_intr(int irq, void *data) 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; diff --git a/devices/e1000/e1000_main-2.6.26-ethercat.c b/devices/e1000/e1000_main-2.6.26-ethercat.c index 77075d41..965fe9d0 100644 --- a/devices/e1000/e1000_main-2.6.26-ethercat.c +++ b/devices/e1000/e1000_main-2.6.26-ethercat.c @@ -3934,10 +3934,10 @@ e1000_intr_msi(int irq, void *data) 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 @@ e1000_intr(int irq, void *data) 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; diff --git a/devices/e1000/e1000_main-2.6.27-ethercat.c b/devices/e1000/e1000_main-2.6.27-ethercat.c index bd663a9d..744c2c10 100644 --- a/devices/e1000/e1000_main-2.6.27-ethercat.c +++ b/devices/e1000/e1000_main-2.6.27-ethercat.c @@ -3891,7 +3891,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data) 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; } @@ -3975,7 +3975,7 @@ static irqreturn_t e1000_intr(int irq, void *data) 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; }