Message ID | 20090214151200.GA5496@yamamaya.is-a-geek.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Tobias Diedrich <ranma+kernel@tdiedrich.de> Date: Sat, 14 Feb 2009 16:12:00 +0100 > commit f55c21fd9a92a444e55ad1ca4e4732d56661bf2e, which was > introduced to fix the regression tracked at > http://bugzilla.kernel.org/show_bug.cgi?id=11358 > causes the wake-on-lan mac to be reversed in the shutdown path. > Apparently the forcedeth situation is rather messy in that the mac > we need to writeback for a subsequent modprobe to work is exactly > the reverse of what is needed for proper wake-on-lan. > > The following patch explains the situation in the comments and > makes the call to nv_restore_mac_addr() conditional (only called if > we are not really going for poweroff). ... > Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de> > Tested-by: Philipp Matthias Hahn <pmhahn@titan.lahn.de> Applied, thanks a lot. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6.29-rc3/drivers/net/forcedeth.c =================================================================== --- linux-2.6.29-rc3.orig/drivers/net/forcedeth.c 2009-02-08 16:31:29.000000000 +0100 +++ linux-2.6.29-rc3/drivers/net/forcedeth.c 2009-02-08 16:39:58.000000000 +0100 @@ -6011,9 +6011,20 @@ if (netif_running(dev)) nv_close(dev); - nv_restore_mac_addr(pdev); + /* + * Restore the MAC so a kernel started by kexec won't get confused. + * If we really go for poweroff, we must not restore the MAC, + * otherwise the MAC for WOL will be reversed at least on some boards. + */ + if (system_state != SYSTEM_POWER_OFF) { + nv_restore_mac_addr(pdev); + } pci_disable_device(pdev); + /* + * Apparently it is not possible to reinitialise from D3 hot, + * only put the device into D3 if we really go for poweroff. + */ if (system_state == SYSTEM_POWER_OFF) { if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled)) pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);