diff options
| author | Auke Kok | 2007-01-31 20:02:46 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2007-02-02 14:34:10 +0100 |
| commit | a53a33da864a81a238ee84055c8ced775ee25350 (patch) | |
| tree | 420bda7c49b0e95ba5e7c20e24cbb75d2f67b74f /drivers/net/e100.c | |
| parent | Merge ../linux-2.6 (diff) | |
| download | kernel-qcow2-linux-a53a33da864a81a238ee84055c8ced775ee25350.tar.gz kernel-qcow2-linux-a53a33da864a81a238ee84055c8ced775ee25350.tar.xz kernel-qcow2-linux-a53a33da864a81a238ee84055c8ced775ee25350.zip | |
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>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 7 |
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) struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); -#ifdef CONFIG_E100_NAPI if (netif_running(netdev)) netif_poll_disable(nic->netdev); -#endif del_timer_sync(&nic->watchdog); netif_carrier_off(nic->netdev); - netif_device_detach(netdev); + pci_save_state(pdev); if ((nic->flags & wol_magic) | e100_asf(nic)) { @@ -2761,16 +2759,13 @@ static int e100_resume(struct pci_dev *pdev) } #endif /* CONFIG_PM */ - static void e100_shutdown(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); -#ifdef CONFIG_E100_NAPI if (netif_running(netdev)) netif_poll_disable(nic->netdev); -#endif del_timer_sync(&nic->watchdog); netif_carrier_off(nic->netdev); |