diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 00bc525c6560..a56491617661 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1468,21 +1468,15 @@ static int ixgbe_clean(struct napi_struct *napi, int budget) | |||
1468 | struct ixgbe_adapter *adapter = container_of(napi, | 1468 | struct ixgbe_adapter *adapter = container_of(napi, |
1469 | struct ixgbe_adapter, napi); | 1469 | struct ixgbe_adapter, napi); |
1470 | struct net_device *netdev = adapter->netdev; | 1470 | struct net_device *netdev = adapter->netdev; |
1471 | int tx_cleaned = 0, work_done = 0; | 1471 | int work_done = 0; |
1472 | |||
1473 | /* Keep link state information with original netdev */ | ||
1474 | if (!netif_carrier_ok(adapter->netdev)) | ||
1475 | goto quit_polling; | ||
1476 | 1472 | ||
1477 | /* In non-MSIX case, there is no multi-Tx/Rx queue */ | 1473 | /* In non-MSIX case, there is no multi-Tx/Rx queue */ |
1478 | tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring); | 1474 | ixgbe_clean_tx_irq(adapter, adapter->tx_ring); |
1479 | ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done, | 1475 | ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done, |
1480 | budget); | 1476 | budget); |
1481 | 1477 | ||
1482 | /* If no Tx and not enough Rx work done, exit the polling mode */ | 1478 | /* If budget not fully consumed, exit the polling mode */ |
1483 | if ((!tx_cleaned && (work_done < budget)) || | 1479 | if (work_done < budget) { |
1484 | !netif_running(adapter->netdev)) { | ||
1485 | quit_polling: | ||
1486 | netif_rx_complete(netdev, napi); | 1480 | netif_rx_complete(netdev, napi); |
1487 | ixgbe_irq_enable(adapter); | 1481 | ixgbe_irq_enable(adapter); |
1488 | } | 1482 | } |