Commit 5e6d5b17 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

igb: remove netif running call from igb_poll

The netif_running check in igb poll is a hold over from the use of fake
netdevs to use multiple queues with NAPI prior to 2.6.24.  It is no longer
necessary to have the call there and it currently can cause errors if
work_done == budget.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92be7917
...@@ -4187,7 +4187,6 @@ static int igb_poll(struct napi_struct *napi, int budget) ...@@ -4187,7 +4187,6 @@ static int igb_poll(struct napi_struct *napi, int budget)
{ {
struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi); struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi);
struct igb_adapter *adapter = rx_ring->adapter; struct igb_adapter *adapter = rx_ring->adapter;
struct net_device *netdev = adapter->netdev;
int work_done = 0; int work_done = 0;
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
...@@ -4206,7 +4205,7 @@ static int igb_poll(struct napi_struct *napi, int budget) ...@@ -4206,7 +4205,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
} }
/* If not enough Rx work done, exit the polling mode */ /* If not enough Rx work done, exit the polling mode */
if ((work_done < budget) || !netif_running(netdev)) { if (work_done < budget) {
napi_complete(napi); napi_complete(napi);
igb_rx_irq_enable(rx_ring); igb_rx_irq_enable(rx_ring);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment