1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4fd2e23720b6..9cc5a6b01bc1 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1389,10 +1389,6 @@ static int e1000_clean(struct napi_struct *napi, int budget)
         /* Must NOT use netdev_priv macro here. */
         adapter = poll_dev->priv;
 
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(poll_dev))
-                goto quit_polling;
-
         /* e1000_clean is called per-cpu.  This lock protects
          * tx_ring from being cleaned by multiple cpus
          * simultaneously.  A failure obtaining the lock means
@@ -1404,10 +1400,11 @@ static int e1000_clean(struct napi_struct *napi, int budget)
 
         adapter->clean_rx(adapter, &work_done, budget);
 
-        /* If no Tx and not enough Rx work done, exit the polling mode */
-        if ((!tx_cleaned && (work_done < budget)) ||
-           !netif_running(poll_dev)) {
-quit_polling:
+        if (tx_cleaned)
+                work_done = budget;
+
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                 if (adapter->itr_setting & 3)
                         e1000_set_itr(adapter);
                 netif_rx_complete(poll_dev, napi);
@@ -2186,6 +2183,7 @@ void e1000e_down(struct e1000_adapter *adapter)
         msleep(10);
 
         napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
         e1000_irq_disable(adapter);
 
         del_timer_sync(&adapter->watchdog_timer);