From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761274AbZEFUj4 (ORCPT ); Wed, 6 May 2009 16:39:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761070AbZEFUiw (ORCPT ); Wed, 6 May 2009 16:38:52 -0400 Received: from kroah.org ([198.145.64.141]:33838 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761022AbZEFUiv (ORCPT ); Wed, 6 May 2009 16:38:51 -0400 X-Mailbox-Line: From greg@blue.kroah.org Wed May 6 13:31:28 2009 Message-Id: <20090506203128.525560962@blue.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 06 May 2009 13:30:14 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Ed Swierk , "David S. Miller" , Tvrtko Ursulin , Chris Wright , Greg Kroah-Hartman Subject: [patch 04/18] forcedeth: Fix resume from hibernation regression. References: <20090506203010.615363711@blue.kroah.org> Content-Disposition: inline; filename=forcedeth-fix-resume-from-hibernation-regression.patch In-Reply-To: <20090506203353.GA14624@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-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 Signed-off-by: Greg Kroah-Hartman --- 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);