Messages in this thread Patch in this message | | | Date | Wed, 06 May 2009 13:30:14 -0700 | From | Greg KH <> | Subject | [patch 04/18] forcedeth: Fix resume from hibernation regression. |
| |
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ed Swierk <eswierk@aristanetworks.com>
upstream commit: 35a7433c789ba6df6d96b70fa745ae9e6cac0038
Reset phy state on resume, fixing a regression caused by powering down the phy on hibernate.
Signed-off-by: Ed Swierk <eswierk@aristanetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Tvrtko Ursulin <tvrtko.ursulin@sophos.com> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/net/forcedeth.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5967,6 +5967,9 @@ static int nv_resume(struct pci_dev *pde for (i = 0;i <= np->register_size/sizeof(u32); i++) writel(np->saved_config_space[i], base+i*sizeof(u32)); + /* restore phy state, including autoneg */ + phy_init(dev); + netif_device_attach(dev); if (netif_running(dev)) { rc = nv_open(dev);
| |