# HG changeset patch # User Florian Pose # Date 1295365462 -3600 # Node ID a3e59f2a8589c77aa8509150c8db5e77c5132e99 # Parent ce2fae4d3c4fae6a3cb6d8a91a3df9bbb272ff82 Changed accidentally used & operator to &&. diff -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.13-ethercat.c --- a/devices/e1000/e1000_main-2.6.13-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.13-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -2682,7 +2682,7 @@ #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 -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.20-ethercat.c --- a/devices/e1000/e1000_main-2.6.20-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.20-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -3879,10 +3879,10 @@ 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 @@ 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 -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.22-ethercat.c --- a/devices/e1000/e1000_main-2.6.22-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.22-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -3860,10 +3860,10 @@ 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 @@ 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 -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.24-ethercat.c --- a/devices/e1000/e1000_main-2.6.24-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.24-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -3857,10 +3857,10 @@ 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 @@ 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 -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.26-ethercat.c --- a/devices/e1000/e1000_main-2.6.26-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.26-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -3934,10 +3934,10 @@ 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 @@ 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 -r ce2fae4d3c4f -r a3e59f2a8589 devices/e1000/e1000_main-2.6.27-ethercat.c --- a/devices/e1000/e1000_main-2.6.27-ethercat.c Fri Jan 14 13:31:30 2011 +0100 +++ b/devices/e1000/e1000_main-2.6.27-ethercat.c Tue Jan 18 16:44:22 2011 +0100 @@ -3891,7 +3891,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; } @@ -3975,7 +3975,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; }