diff options
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 9de71443ef89..13d57b0a88fa 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -3919,7 +3919,7 @@ e1000_clean(struct napi_struct *napi, int budget) | |||
3919 | { | 3919 | { |
3920 | struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); | 3920 | struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); |
3921 | struct net_device *poll_dev = adapter->netdev; | 3921 | struct net_device *poll_dev = adapter->netdev; |
3922 | int tx_cleaned = 0, work_done = 0; | 3922 | int work_done = 0; |
3923 | 3923 | ||
3924 | /* Must NOT use netdev_priv macro here. */ | 3924 | /* Must NOT use netdev_priv macro here. */ |
3925 | adapter = poll_dev->priv; | 3925 | adapter = poll_dev->priv; |
@@ -3929,16 +3929,16 @@ e1000_clean(struct napi_struct *napi, int budget) | |||
3929 | * simultaneously. A failure obtaining the lock means | 3929 | * simultaneously. A failure obtaining the lock means |
3930 | * tx_ring[0] is currently being cleaned anyway. */ | 3930 | * tx_ring[0] is currently being cleaned anyway. */ |
3931 | if (spin_trylock(&adapter->tx_queue_lock)) { | 3931 | if (spin_trylock(&adapter->tx_queue_lock)) { |
3932 | tx_cleaned = e1000_clean_tx_irq(adapter, | 3932 | e1000_clean_tx_irq(adapter, |
3933 | &adapter->tx_ring[0]); | 3933 | &adapter->tx_ring[0]); |
3934 | spin_unlock(&adapter->tx_queue_lock); | 3934 | spin_unlock(&adapter->tx_queue_lock); |
3935 | } | 3935 | } |
3936 | 3936 | ||
3937 | adapter->clean_rx(adapter, &adapter->rx_ring[0], | 3937 | adapter->clean_rx(adapter, &adapter->rx_ring[0], |
3938 | &work_done, budget); | 3938 | &work_done, budget); |
3939 | 3939 | ||
3940 | /* If no Tx and not enough Rx work done, exit the polling mode */ | 3940 | /* If budget not fully consumed, exit the polling mode */ |
3941 | if ((!tx_cleaned && (work_done == 0))) { | 3941 | if (work_done < budget) { |
3942 | if (likely(adapter->itr_setting & 3)) | 3942 | if (likely(adapter->itr_setting & 3)) |
3943 | e1000_set_itr(adapter); | 3943 | e1000_set_itr(adapter); |
3944 | netif_rx_complete(poll_dev, napi); | 3944 | netif_rx_complete(poll_dev, napi); |