diff options
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 4f37506ad374..9de71443ef89 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -3924,10 +3924,6 @@ e1000_clean(struct napi_struct *napi, int budget) | |||
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; |
3926 | 3926 | ||
3927 | /* Keep link state information with original netdev */ | ||
3928 | if (!netif_carrier_ok(poll_dev)) | ||
3929 | goto quit_polling; | ||
3930 | |||
3931 | /* e1000_clean is called per-cpu. This lock protects | 3927 | /* e1000_clean is called per-cpu. This lock protects |
3932 | * tx_ring[0] from being cleaned by multiple cpus | 3928 | * tx_ring[0] from being cleaned by multiple cpus |
3933 | * simultaneously. A failure obtaining the lock means | 3929 | * simultaneously. A failure obtaining the lock means |
@@ -3942,9 +3938,7 @@ e1000_clean(struct napi_struct *napi, int budget) | |||
3942 | &work_done, budget); | 3938 | &work_done, budget); |
3943 | 3939 | ||
3944 | /* If no Tx and not enough Rx work done, exit the polling mode */ | 3940 | /* If no Tx and not enough Rx work done, exit the polling mode */ |
3945 | if ((!tx_cleaned && (work_done == 0)) || | 3941 | if ((!tx_cleaned && (work_done == 0))) { |
3946 | !netif_running(poll_dev)) { | ||
3947 | quit_polling: | ||
3948 | if (likely(adapter->itr_setting & 3)) | 3942 | if (likely(adapter->itr_setting & 3)) |
3949 | e1000_set_itr(adapter); | 3943 | e1000_set_itr(adapter); |
3950 | netif_rx_complete(poll_dev, napi); | 3944 | netif_rx_complete(poll_dev, napi); |