aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-03-13 20:40:38 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-14 12:41:01 -0700
commit5e6d5b17db099dd575490545a4f0af9a99fa8bbe (patch)
treefd2bf6e8ae3e7cf6e4f4a0c853873dbd2b88c1cf
parent92be791759945a9170394e92c03a2e75175d6bbe (diff)
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: Alexander Duyck <alexander.h.duyck@intel.com> Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/igb/igb_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 2cb267fc9c7..4ff242de981 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -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_adapter *adapter = rx_ring->adapter;
- struct net_device *netdev = adapter->netdev;
int work_done = 0;
#ifdef CONFIG_IGB_DCA
@@ -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 ((work_done < budget) || !netif_running(netdev)) {
+ if (work_done < budget) {
napi_complete(napi);
igb_rx_irq_enable(rx_ring);
}