From 1f3cdc91b1f38b173af478661d1fda8d735b4add Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 23 Nov 2011 15:11:07 +0100 Subject: [PATCH] Fixed accidentially used operator & by using &&. --- devices/e1000/e1000_main-2.6.31-ethercat.c | 2 +- devices/e1000/e1000_main-2.6.33-ethercat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/e1000/e1000_main-2.6.31-ethercat.c b/devices/e1000/e1000_main-2.6.31-ethercat.c index 2a19e67c..78034ba8 100644 --- a/devices/e1000/e1000_main-2.6.31-ethercat.c +++ b/devices/e1000/e1000_main-2.6.31-ethercat.c @@ -3804,7 +3804,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; } diff --git a/devices/e1000/e1000_main-2.6.33-ethercat.c b/devices/e1000/e1000_main-2.6.33-ethercat.c index 3c14d5f3..157e142b 100644 --- a/devices/e1000/e1000_main-2.6.33-ethercat.c +++ b/devices/e1000/e1000_main-2.6.33-ethercat.c @@ -3468,7 +3468,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; }