aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-03-13 16:40:38 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-14 15:41:01 -0400
commit5e6d5b17db099dd575490545a4f0af9a99fa8bbe (patch)
treefd2bf6e8ae3e7cf6e4f4a0c853873dbd2b88c1cf /drivers/net/igb/igb_main.c
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>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-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 2cb267fc9c7e..4ff242de981e 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)
4187{ 4187{
4188 struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi); 4188 struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi);
4189 struct igb_adapter *adapter = rx_ring->adapter; 4189 struct igb_adapter *adapter = rx_ring->adapter;
4190 struct net_device *netdev = adapter->netdev;
4191 int work_done = 0; 4190 int work_done = 0;
4192 4191
4193#ifdef CONFIG_IGB_DCA 4192#ifdef CONFIG_IGB_DCA
@@ -4206,7 +4205,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
4206 } 4205 }
4207 4206
4208 /* If not enough Rx work done, exit the polling mode */ 4207 /* If not enough Rx work done, exit the polling mode */
4209 if ((work_done < budget) || !netif_running(netdev)) { 4208 if (work_done < budget) {
4210 napi_complete(napi); 4209 napi_complete(napi);
4211 igb_rx_irq_enable(rx_ring); 4210 igb_rx_irq_enable(rx_ring);
4212 } 4211 }