From patchwork Sat Feb 7 09:21:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 22487 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 549CADDDEE for ; Sat, 7 Feb 2009 20:22:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753323AbZBGJVe (ORCPT ); Sat, 7 Feb 2009 04:21:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753615AbZBGJVd (ORCPT ); Sat, 7 Feb 2009 04:21:33 -0500 Received: from qmta05.westchester.pa.mail.comcast.net ([76.96.62.48]:44136 "EHLO QMTA05.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755987AbZBGJVa (ORCPT ); Sat, 7 Feb 2009 04:21:30 -0500 Received: from OMTA12.westchester.pa.mail.comcast.net ([76.96.62.44]) by QMTA05.westchester.pa.mail.comcast.net with comcast id CxMW1b0050xGWP855xMWJB; Sat, 07 Feb 2009 09:21:30 +0000 Received: from lost.foo-projects.org ([63.64.152.142]) by OMTA12.westchester.pa.mail.comcast.net with comcast id CxMB1b00934bfcX3YxME1w; Sat, 07 Feb 2009 09:21:28 +0000 From: Jeff Kirsher Subject: [net-next PATCH 19/26] igb: move get_hw_control within igb_resume. To: davem@davemloft.net Cc: netdev@vger.kernel.org, jeff@garzik.org, gospo@redhat.com, Alexander Duyck , Jeff Kirsher Date: Sat, 07 Feb 2009 01:21:10 -0800 Message-ID: <20090207092110.15697.6428.stgit@lost.foo-projects.org> In-Reply-To: <20090207091504.15697.26667.stgit@lost.foo-projects.org> References: <20090207091504.15697.26667.stgit@lost.foo-projects.org> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Duyck Move igb_get_hw_control up so that it is called just after the reset in igb_resume. This notifies the HW sooner that the driver is reassuming control of the device. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) -- 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/igb/igb_main.c b/drivers/net/igb/igb_main.c index 56c1455..accab3f 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -4341,6 +4341,11 @@ static int igb_resume(struct pci_dev *pdev) /* e1000_power_up_phy(adapter); */ igb_reset(adapter); + + /* let the f/w know that the h/w is now under the control of the + * driver. */ + igb_get_hw_control(adapter); + wr32(E1000_WUS, ~0); if (netif_running(netdev)) { @@ -4351,10 +4356,6 @@ static int igb_resume(struct pci_dev *pdev) netif_device_attach(netdev); - /* let the f/w know that the h/w is now under the control of the - * driver. */ - igb_get_hw_control(adapter); - return 0; } #endif