diff options
| author | David S. Miller <davem@davemloft.net> | 2008-01-08 05:48:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-09 08:30:09 +0100 |
| commit | 4ec2411980d0fd2995e8dea8a06fe57aa47523cb (patch) | |
| tree | a4013547ff1bda8fc038623290debd62ad6dd7fe /drivers/net/ixgbe | |
| parent | [NET]: Add NAPI_STATE_DISABLE. (diff) | |
| download | linux-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.tar.xz linux-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.zip | |
[NET]: Do not check netif_running() and carrier state in ->poll()
Drivers do this to try to break out of the ->poll()'ing loop
when the device is being brought administratively down.
Now that we have a napi_disable() "pending" state we are going
to solve that problem generically.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 00bc525c6560..7c319303f0f8 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1470,19 +1470,13 @@ static int ixgbe_clean(struct napi_struct *napi, int budget) struct net_device *netdev = adapter->netdev; int tx_cleaned = 0, work_done = 0; - /* Keep link state information with original netdev */ - if (!netif_carrier_ok(adapter->netdev)) - goto quit_polling; - /* In non-MSIX case, there is no multi-Tx/Rx queue */ tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring); ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done, budget); /* If no Tx and not enough Rx work done, exit the polling mode */ - if ((!tx_cleaned && (work_done < budget)) || - !netif_running(adapter->netdev)) { -quit_polling: + if ((!tx_cleaned && (work_done < budget))) { netif_rx_complete(netdev, napi); ixgbe_irq_enable(adapter); } |