diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-08-26 07:25:11 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-03 10:08:17 -0400 |
commit | 1a32bcfb5706d06a49904383b02f7c1d24172b96 (patch) | |
tree | 2c63987675269ff62efd67f005d73c003c94e4ef /drivers/net/igb | |
parent | fc7d345d11e815705fd0c9badc2ee82cb7ca5a84 (diff) |
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 <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 5 |
1 files changed, 0 insertions, 5 deletions
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) | |||
3563 | struct net_device *netdev = adapter->netdev; | 3563 | struct net_device *netdev = adapter->netdev; |
3564 | int work_done = 0; | 3564 | int work_done = 0; |
3565 | 3565 | ||
3566 | /* Keep link state information with original netdev */ | ||
3567 | if (!netif_carrier_ok(netdev)) | ||
3568 | goto quit_polling; | ||
3569 | |||
3570 | #ifdef CONFIG_DCA | 3566 | #ifdef CONFIG_DCA |
3571 | if (adapter->flags & IGB_FLAG_DCA_ENABLED) | 3567 | if (adapter->flags & IGB_FLAG_DCA_ENABLED) |
3572 | igb_update_rx_dca(rx_ring); | 3568 | igb_update_rx_dca(rx_ring); |
@@ -3576,7 +3572,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget) | |||
3576 | 3572 | ||
3577 | /* If not enough Rx work done, exit the polling mode */ | 3573 | /* If not enough Rx work done, exit the polling mode */ |
3578 | if ((work_done == 0) || !netif_running(netdev)) { | 3574 | if ((work_done == 0) || !netif_running(netdev)) { |
3579 | quit_polling: | ||
3580 | netif_rx_complete(netdev, napi); | 3575 | netif_rx_complete(netdev, napi); |
3581 | 3576 | ||
3582 | if (adapter->itr_setting & 3) { | 3577 | if (adapter->itr_setting & 3) { |