diff options
| author | Ed Swierk <eswierk@aristanetworks.com> | 2009-04-06 17:49:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-08 14:54:33 -0700 |
| commit | 1271c912ea7d12fe6bd3034ba5b0c03f828d69c9 (patch) | |
| tree | 3717cdda4dac90ef97a9d25f461f48a2ba0b921f | |
| parent | 2df0656b23614f2647ba4b1d40f4fc5b9f9ef32b (diff) | |
forcedeth: Fix resume from hibernation regression.
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>
| -rw-r--r-- | drivers/net/forcedeth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index eeb55ed2152d..bf76dec2dc55 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5967,6 +5967,9 @@ static int nv_resume(struct pci_dev *pdev) 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); |