]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
igb: remove netif running call from igb_poll
authorAlexander Duyck <alexander.h.duyck@intel.com>
Fri, 13 Mar 2009 20:40:38 +0000 (20:40 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Mar 2009 19:41:01 +0000 (12:41 -0700)
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>
drivers/net/igb/igb_main.c

index 2cb267fc9c7e3d795dcc5dac3c9ef02b40d5d13a..4ff242de981ee086de21a9f0d28458f6a195efa3 100644 (file)
@@ -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);
        }