aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2007-01-31 14:02:46 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-02 08:34:10 -0500
commita53a33da864a81a238ee84055c8ced775ee25350 (patch)
tree420bda7c49b0e95ba5e7c20e24cbb75d2f67b74f
parentae2c27a78f1df5b0967069cd3b916cff1eb044c8 (diff)
e100: fix napi ifdefs removing needed code
e100: fix napi ifdefs removing needed code From: Auke Kok <auke-jan.h.kok@intel.com> The e100 driver is NAPI mode only. We need to netif_poll_disable during suspend and shutdown. The non-NAPI driver code was removed and is only avaiable in the out-of-tree e100 kernel driver. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/e100.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 3208dac29168..0cefef5e3f06 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2718,14 +2718,12 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
2718 struct net_device *netdev = pci_get_drvdata(pdev); 2718 struct net_device *netdev = pci_get_drvdata(pdev);
2719 struct nic *nic = netdev_priv(netdev); 2719 struct nic *nic = netdev_priv(netdev);
2720 2720
2721#ifdef CONFIG_E100_NAPI
2722 if (netif_running(netdev)) 2721 if (netif_running(netdev))
2723 netif_poll_disable(nic->netdev); 2722 netif_poll_disable(nic->netdev);
2724#endif
2725 del_timer_sync(&nic->watchdog); 2723 del_timer_sync(&nic->watchdog);
2726 netif_carrier_off(nic->netdev); 2724 netif_carrier_off(nic->netdev);
2727
2728 netif_device_detach(netdev); 2725 netif_device_detach(netdev);
2726
2729 pci_save_state(pdev); 2727 pci_save_state(pdev);
2730 2728
2731 if ((nic->flags & wol_magic) | e100_asf(nic)) { 2729 if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2761,16 +2759,13 @@ static int e100_resume(struct pci_dev *pdev)
2761} 2759}
2762#endif /* CONFIG_PM */ 2760#endif /* CONFIG_PM */
2763 2761
2764
2765static void e100_shutdown(struct pci_dev *pdev) 2762static void e100_shutdown(struct pci_dev *pdev)
2766{ 2763{
2767 struct net_device *netdev = pci_get_drvdata(pdev); 2764 struct net_device *netdev = pci_get_drvdata(pdev);
2768 struct nic *nic = netdev_priv(netdev); 2765 struct nic *nic = netdev_priv(netdev);
2769 2766
2770#ifdef CONFIG_E100_NAPI
2771 if (netif_running(netdev)) 2767 if (netif_running(netdev))
2772 netif_poll_disable(nic->netdev); 2768 netif_poll_disable(nic->netdev);
2773#endif
2774 del_timer_sync(&nic->watchdog); 2769 del_timer_sync(&nic->watchdog);
2775 netif_carrier_off(nic->netdev); 2770 netif_carrier_off(nic->netdev);
2776 2771