]> err.no Git - linux-2.6/commitdiff
atl1: add shutdown callback
authorJay Cliburn <jacliburn@bellsouth.net>
Sat, 10 May 2008 03:12:08 +0000 (22:12 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 13 May 2008 05:30:24 +0000 (01:30 -0400)
Add a shutdown callback that points to atl1_suspend().  This, along
with a working suspend function, fixes wake-on-lan.

Tested-by: Per Olofsson <pelle@dsv.su.se>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/atlx/atl1.c

index 12fb3e5529d16e4c56f60d9ef646d4db3e7d7e45..b7092a330f56721a37e051e13057c4b5d98bb8fc 100644 (file)
@@ -36,7 +36,6 @@
  * A very incomplete list of things that need to be dealt with:
  *
  * TODO:
- * Wake on LAN.
  * Add more ethtool functions.
  * Fix abstruse irq enable/disable condition described here:
  *     http://marc.theaimsgroup.com/?l=linux-netdev&m=116398508500553&w=2
@@ -2908,6 +2907,13 @@ static int atl1_resume(struct pci_dev *pdev)
 #define atl1_resume NULL
 #endif
 
+static void atl1_shutdown(struct pci_dev *pdev)
+{
+#ifdef CONFIG_PM
+       atl1_suspend(pdev, PMSG_SUSPEND);
+#endif
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void atl1_poll_controller(struct net_device *netdev)
 {
@@ -3154,7 +3160,8 @@ static struct pci_driver atl1_driver = {
        .probe = atl1_probe,
        .remove = __devexit_p(atl1_remove),
        .suspend = atl1_suspend,
-       .resume = atl1_resume
+       .resume = atl1_resume,
+       .shutdown = atl1_shutdown
 };
 
 /*