From patchwork Mon Apr 6 14:03:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Swierk X-Patchwork-Id: 25636 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BF7DFDE0E0 for ; Tue, 7 Apr 2009 00:03:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755301AbZDFODm (ORCPT ); Mon, 6 Apr 2009 10:03:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755530AbZDFODl (ORCPT ); Mon, 6 Apr 2009 10:03:41 -0400 Received: from wf-out-1314.google.com ([209.85.200.172]:46938 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755206AbZDFODk (ORCPT ); Mon, 6 Apr 2009 10:03:40 -0400 Received: by wf-out-1314.google.com with SMTP id 29so2250967wff.4 for ; Mon, 06 Apr 2009 07:03:39 -0700 (PDT) Received: by 10.142.199.15 with SMTP id w15mr1313996wff.23.1239026619015; Mon, 06 Apr 2009 07:03:39 -0700 (PDT) Received: from ?172.17.2.29? (65-119-47-100.dia.static.qwest.net [65.119.47.100]) by mx.google.com with ESMTPS id 24sm4316028wff.22.2009.04.06.07.03.36 (version=SSLv3 cipher=RC4-MD5); Mon, 06 Apr 2009 07:03:37 -0700 (PDT) Subject: Re: [Regression, in, 2.6.29] forcedeth doesn't work after resume from hibernation (was: Re: Resume after hibernation regression in 2.6.29) From: Ed Swierk To: David Miller Cc: netdev@vger.kernel.org In-Reply-To: <20090404.165421.142076064.davem@davemloft.net> References: <20090404.165421.142076064.davem@davemloft.net> Date: Mon, 06 Apr 2009 07:03:32 -0700 Message-Id: <1239026612.23068.1.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, 2009-04-04 at 16:54 -0700, David Miller wrote: > Please send a version of this patch that actually applies to > Linus's tree, the line numbers et al. are a lot different > now. > > I'll backport and submit that to -stable. > > Thanks. Reset phy state on resume, fixing a regression caused by powering down the phy on hibernate. Signed-off-by: Ed Swierk --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index a858c6f..663a7b3 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);