[netdrvr] forcedeth: setup wake-on-lan before shutting down
authorTobias Diedrich <ranma+kernel@tdiedrich.de>
Sun, 18 May 2008 13:02:37 +0000 (15:02 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Sat, 31 May 2008 02:18:49 +0000 (22:18 -0400)
When hibernating in 'shutdown' mode, after saving the image the suspend hook
is not called again.
However, if the device is in promiscous mode, wake-on-lan will not work.
This adds a shutdown hook to setup wake-on-lan before the final shutdown.

Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/forcedeth.c

index 9eca97fb0a54ab58b35eba4ae3aff614e7d4233d..215d27bbeffe8924db96cc9d766f3e19afe8b370 100644 (file)
@@ -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)