]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
WOL bugfix for 3c59x.c
authorSteffen Klassert <klassert@mathematik.tu-chemnitz.de>
Tue, 16 Oct 2007 21:24:09 +0000 (14:24 -0700)
committerJeff Garzik <jeff@garzik.org>
Wed, 17 Oct 2007 01:10:29 +0000 (21:10 -0400)
Some NICs (3c905B) can not generate PME in power state PCI_D0, while others
like 3c905C can.  Call pci_enable_wake() with PCI_D3hot should give proper
WOL for 3c905B.

Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Tested-by: Harry Coin <hcoin@n4comm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/3c59x.c

index 8d3893da06f539da701c45b29cb158f2705543d5..862f47223fdc9e26e18df0babf94c5ca5eaefed5 100644 (file)
@@ -3118,7 +3118,13 @@ static void acpi_set_WOL(struct net_device *dev)
                iowrite16(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
                iowrite16(RxEnable, ioaddr + EL3_CMD);
 
-               pci_enable_wake(VORTEX_PCI(vp), 0, 1);
+               if (pci_enable_wake(VORTEX_PCI(vp), PCI_D3hot, 1)) {
+                       printk(KERN_INFO "%s: WOL not supported.\n",
+                                       pci_name(VORTEX_PCI(vp)));
+
+                       vp->enable_wol = 0;
+                       return;
+               }
 
                /* Change the power state to D3; RxEnable doesn't take effect. */
                pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);