2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Ed Swierk upstream commit: 35a7433c789ba6df6d96b70fa745ae9e6cac0038 Reset phy state on resume, fixing a regression caused by powering down the phy on hibernate. Signed-off-by: Ed Swierk Signed-off-by: David S. Miller Cc: Tvrtko Ursulin Signed-off-by: Chris Wright --- drivers/net/forcedeth.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5995,6 +5995,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); -- 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/