From b7bb6904cf13dbbfc08d0ae412b686ed1933f27f Mon Sep 17 00:00:00 2001 From: Tobias Diedrich Date: Sun, 18 May 2008 15:02:37 +0200 Subject: [PATCH] --- yaml --- r: 102671 b: refs/heads/master c: f735a2a1a4f2a0f5cd823ce323e82675990469e2 h: refs/heads/master i: 102669: 7c9146e5771ca83fc6e5cc59a66b6997a64b74e9 102667: 962cc3e972ee283ecb68c92d9c467dc9d00112b1 102663: 943033cd423f566df8f819b17ff0d65f8b792d3d 102655: 791018346d42207ec9a9236317b21248ceb51838 v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f7b83ffa0ab..1fa563f23f16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2914f3efa7ef80f12ff798cb1aa46af57838f912 +refs/heads/master: f735a2a1a4f2a0f5cd823ce323e82675990469e2 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 9eca97fb0a54..215d27bbeffe 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -5827,8 +5827,23 @@ static int nv_resume(struct pci_dev *pdev) out: return rc; } + +static void nv_shutdown(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); + struct fe_priv *np = netdev_priv(dev); + + if (netif_running(dev)) + nv_close(dev); + + pci_enable_wake(pdev, PCI_D3hot, np->wolenabled); + pci_enable_wake(pdev, PCI_D3cold, np->wolenabled); + pci_disable_device(pdev); + pci_set_power_state(pdev, PCI_D3hot); +} #else #define nv_suspend NULL +#define nv_shutdown NULL #define nv_resume NULL #endif /* CONFIG_PM */ @@ -5999,6 +6014,7 @@ static struct pci_driver driver = { .remove = __devexit_p(nv_remove), .suspend = nv_suspend, .resume = nv_resume, + .shutdown = nv_shutdown, }; static int __init init_nic(void)