diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 20:13:52 +0300 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 20:13:52 +0300 |
| commit | 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (patch) | |
| tree | 69872715982d49ddea5819040c7032062376183b /drivers/net/forcedeth.c | |
| parent | efeff568677aa325f84d3ce37c219019887a79eb (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
| download | linux-1264fa6f8c5bf561a86128b2d48ace53e3f1e66f.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-fixes
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 5b910cf63740..b8251e827059 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); |