From 59f4758b87cca2447c6cb46cbb9517b0a9982c05 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 13 Mar 2009 20:40:38 +0000 Subject: [PATCH] --- yaml --- r: 135187 b: refs/heads/master c: 5e6d5b17db099dd575490545a4f0af9a99fa8bbe h: refs/heads/master i: 135185: cb8cbabb4a58abe6e7ce202a883acf72d470e838 135183: 9556e8e2dd674a04f629dc3f221d4d744de14d83 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c52a2770079..2abf39cf1e2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92be791759945a9170394e92c03a2e75175d6bbe +refs/heads/master: 5e6d5b17db099dd575490545a4f0af9a99fa8bbe diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 2cb267fc9c7e..4ff242de981e 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/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); }