The patch titled
forcedeth: setup wake-on-lan before shutting down
has been removed from the -mm tree. Its filename was
setup-wake-on-lan-before-shutting-down.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: forcedeth: setup wake-on-lan before shutting down
From: Tobias Diedrich <ranma+kernel@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Cc: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/forcedeth.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff -puN drivers/net/forcedeth.c~setup-wake-on-lan-before-shutting-down drivers/net/forcedeth.c
--- a/drivers/net/forcedeth.c~setup-wake-on-lan-before-shutting-down
+++ a/drivers/net/forcedeth.c
@@ -5835,8 +5835,23 @@ static int nv_resume(struct pci_dev *pde
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 */
@@ -6007,6 +6022,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)
_
Patches currently in -mm which might be from ranma+kernel@xxxxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
