diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4fd2e23720..dd9698cfbb 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) | |||
| 1389 | /* Must NOT use netdev_priv macro here. */ | 1389 | /* Must NOT use netdev_priv macro here. */ |
| 1390 | adapter = poll_dev->priv; | 1390 | adapter = poll_dev->priv; |
| 1391 | 1391 | ||
| 1392 | /* Keep link state information with original netdev */ | ||
| 1393 | if (!netif_carrier_ok(poll_dev)) | ||
| 1394 | goto quit_polling; | ||
| 1395 | |||
| 1396 | /* e1000_clean is called per-cpu. This lock protects | 1392 | /* e1000_clean is called per-cpu. This lock protects |
| 1397 | * tx_ring from being cleaned by multiple cpus | 1393 | * tx_ring from being cleaned by multiple cpus |
| 1398 | * simultaneously. A failure obtaining the lock means | 1394 | * simultaneously. A failure obtaining the lock means |
| @@ -1405,9 +1401,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) | |||
| 1405 | adapter->clean_rx(adapter, &work_done, budget); | 1401 | adapter->clean_rx(adapter, &work_done, budget); |
| 1406 | 1402 | ||
| 1407 | /* If no Tx and not enough Rx work done, exit the polling mode */ | 1403 | /* If no Tx and not enough Rx work done, exit the polling mode */ |
| 1408 | if ((!tx_cleaned && (work_done < budget)) || | 1404 | if ((!tx_cleaned && (work_done < budget))) { |
| 1409 | !netif_running(poll_dev)) { | ||
| 1410 | quit_polling: | ||
| 1411 | if (adapter->itr_setting & 3) | 1405 | if (adapter->itr_setting & 3) |
| 1412 | e1000_set_itr(adapter); | 1406 | e1000_set_itr(adapter); |
| 1413 | netif_rx_complete(poll_dev, napi); | 1407 | netif_rx_complete(poll_dev, napi); |
