equal
deleted
inserted
replaced
3855 int ec_work_done = 0; |
3855 int ec_work_done = 0; |
3856 #endif |
3856 #endif |
3857 for (i = 0; i < E1000_MAX_INTR; i++) |
3857 for (i = 0; i < E1000_MAX_INTR; i++) |
3858 #ifdef CONFIG_E1000_NAPI |
3858 #ifdef CONFIG_E1000_NAPI |
3859 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring, |
3859 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring, |
3860 &ec_work_done, 100) & |
3860 &ec_work_done, 100) && |
3861 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3861 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3862 #else |
3862 #else |
3863 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) & |
3863 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) && |
3864 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3864 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3865 #endif |
3865 #endif |
3866 break; |
3866 break; |
3867 } else { |
3867 } else { |
3868 uint32_t icr = E1000_READ_REG(hw, ICR); |
3868 uint32_t icr = E1000_READ_REG(hw, ICR); |
3971 int ec_work_done = 0; |
3971 int ec_work_done = 0; |
3972 #endif |
3972 #endif |
3973 for (i = 0; i < E1000_MAX_INTR; i++) |
3973 for (i = 0; i < E1000_MAX_INTR; i++) |
3974 #ifdef CONFIG_E1000_NAPI |
3974 #ifdef CONFIG_E1000_NAPI |
3975 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring, |
3975 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring, |
3976 &ec_work_done, 100) & |
3976 &ec_work_done, 100) && |
3977 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3977 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3978 #else |
3978 #else |
3979 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) & |
3979 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) && |
3980 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3980 !e1000_clean_tx_irq(adapter, adapter->tx_ring))) |
3981 #endif |
3981 #endif |
3982 break; |
3982 break; |
3983 } else { |
3983 } else { |
3984 #ifdef CONFIG_E1000_NAPI |
3984 #ifdef CONFIG_E1000_NAPI |