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

Changed accidentally used & operator to &&.

This commit is contained in:
Florian Pose 2011-01-18 16:44:22 +01:00
parent 8bb190f9e5
commit 14ef263385
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

8
devices/e1000/e1000_main-2.6.20-ethercat.c
View File

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

8
devices/e1000/e1000_main-2.6.22-ethercat.c
View File

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

8
devices/e1000/e1000_main-2.6.24-ethercat.c
View File

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

8
devices/e1000/e1000_main-2.6.26-ethercat.c
View File

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

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

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