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 15:44:57 -0700 |
| commit | 217b4400b6d789dbbd55d854d5f4db9d3a5817d1 (patch) | |
| tree | c6fd943d9fbb7fa97b8d985fbd73f5afa61a6c38 /drivers | |
| parent | e34454757fb87ecac1f76e4169cff6b74ba7ec44 (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>
Diffstat (limited to 'drivers')
| -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 b8251e827059..df0794e85576 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5995,6 +5995,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); |