On Mon, Aug 18, 2008 at 3:08 PM, Rafael J. Wysocki [off-list ref] wrote:

On Monday, 18 of August 2008, Yinghai Lu wrote:

quoted

On Mon, Aug 18, 2008 at 3:22 AM, Rafael J. Wysocki [off-list ref] wrote:

quoted

quoted

quoted

quoted

 drivers/net/forcedeth.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: linux-2.6/drivers/net/forcedeth.c
===================================================================

--- linux-2.6.orig/drivers/net/forcedeth.c
+++ linux-2.6/drivers/net/forcedeth.c

@@ -5975,10 +5975,12 @@ static void nv_shutdown(struct pci_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);
+       if (system_state == SYSTEM_POWER_OFF) {
+               if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled))
+                       pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
 }
 #else
 #define nv_suspend NULL

quoted

Does the last patch work for you BTW?

it works.

OK, thanks for testing.

I think we can use it as a quick fix for 2.6.27.  Do you agree?

yes

YH