From: Alexander Duyck Date: Tue, 26 Aug 2008 11:25:11 +0000 (-0700) Subject: igb: clean up a stray fake netdev code left in rx path X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1a32bcfb5706d06a49904383b02f7c1d24172b96;p=openwrt%2Fstaging%2Fblogic.git igb: clean up a stray fake netdev code left in rx path Remove code that was in place to support fake netdev Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 03806e299486..93d02efa9a0a 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -3563,10 +3563,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget) struct net_device *netdev = adapter->netdev; int work_done = 0; - /* Keep link state information with original netdev */ - if (!netif_carrier_ok(netdev)) - goto quit_polling; - #ifdef CONFIG_DCA if (adapter->flags & IGB_FLAG_DCA_ENABLED) igb_update_rx_dca(rx_ring); @@ -3576,7 +3572,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget) /* If not enough Rx work done, exit the polling mode */ if ((work_done == 0) || !netif_running(netdev)) { -quit_polling: netif_rx_complete(netdev, napi); if (adapter->itr_setting & 3) {