bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed accidentially used operator & by using &&.

This commit is contained in:
Florian Pose 2011-11-23 15:11:07 +01:00
parent 3eb1e91468
commit bd95e2d370
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/e1000/e1000_main-2.6.29-ethercat.c
View File

@ -3766,7 +3766,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;
}
@ -3850,7 +3850,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;
}

2
devices/e1000/e1000_main-2.6.31-ethercat.c
View File

@ -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;
}

2
devices/e1000/e1000_main-2.6.33-ethercat.c
View File

@ -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;
}