Messages in this thread Patch in this message | | | Date | Sun, 18 May 2008 01:24:11 +0200 | From | Tobias Diedrich <> | Subject | Re: hibernate event order question |
| |
Tobias Diedrich wrote: > > > Shouldn't there be a 'prepare for poweroff'-callback, which gets > > > called > > > before the system is powered off for real? > > > > Yes, it should and it's called in recent kernels. > > For what values of 'recent'? > I'm running 2.6.26-rc2 here. :) > How do I hook into this callback? > (suspend_late maybe? Going to try that one next...)
Ok, this patch fixes the 'regression' introduced by the previous patch (at least for me ;)):
Index: linux-2.6.26-rc2.forcedwol/drivers/net/forcedeth.c =================================================================== --- linux-2.6.26-rc2.forcedwol.orig/drivers/net/forcedeth.c 2008-05-18 01:10:18.000000000 +0200 +++ linux-2.6.26-rc2.forcedwol/drivers/net/forcedeth.c 2008-05-18 01:11:33.000000000 +0200 @@ -5828,8 +5828,24 @@ out: return rc; } + +static void nv_shutdown(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); + struct fe_priv *np = netdev_priv(dev); + u8 __iomem *base = get_hwbase(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); +} #else #define nv_suspend NULL +#define nv_shutdown NULL #define nv_resume NULL #endif /* CONFIG_PM */ @@ -6000,6 +6016,7 @@ .remove = __devexit_p(nv_remove), .suspend = nv_suspend, .resume = nv_resume, + .shutdown = nv_shutdown, }; static int __init init_nic(void) -- Tobias PGP: http://9ac7e0bc.uguu.de このメールは十割再利用されたビットで作られています。 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |