From e5fe08c02ab9773f3ace4cf956404711d5c81af9 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 31 Jan 2007 11:02:46 -0800 Subject: [PATCH] --- yaml --- r: 46044 b: refs/heads/master c: a53a33da864a81a238ee84055c8ced775ee25350 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d4876f47d40c..3f18c665ee5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae2c27a78f1df5b0967069cd3b916cff1eb044c8 +refs/heads/master: a53a33da864a81a238ee84055c8ced775ee25350 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 3208dac29168..0cefef5e3f06 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/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);