From: Ed Swierk <eswierk@aristanetworks.com>
Date: Tue, 7 Apr 2009 00:49:12 +0000 (-0700)
Subject: forcedeth: Fix resume from hibernation regression.
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35a7433c789ba6df6d96b70fa745ae9e6cac0038;p=linux-2.6-omap-h63xx.git

forcedeth: Fix resume from hibernation regression.

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>
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a858c6ff80d..663a7b3261e 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev)
 
 	pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
 
+	/* restore phy state, including autoneg */
+	phy_init(dev);
+
 	netif_device_attach(dev);
 	if (netif_running(dev)) {
 		rc = nv_open(dev);