diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
| commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
| tree | fcdedce488db0f80c7a816e0b52df83a01972838 /drivers/net/forcedeth.c | |
| parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
| parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) | |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 5b910cf6374..b8251e82705 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -6011,9 +6011,20 @@ static void nv_shutdown(struct pci_dev *pdev) 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); |