From patchwork Thu Apr 7 04:08:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 90127 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 8BC97B6F1E for ; Thu, 7 Apr 2011 14:09:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751132Ab1DGEJG (ORCPT ); Thu, 7 Apr 2011 00:09:06 -0400 Received: from exht1.emulex.com ([138.239.113.183]:55059 "EHLO exht1.ad.emulex.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751052Ab1DGEJG (ORCPT ); Thu, 7 Apr 2011 00:09:06 -0400 Received: from akhaparde-VBox (138.239.115.78) by exht1.ad.emulex.com (138.239.113.183) with Microsoft SMTP Server (TLS) id 8.3.137.0; Wed, 6 Apr 2011 21:08:45 -0700 Date: Wed, 6 Apr 2011 23:08:43 -0500 From: Ajit Khaparde To: Subject: [PATCH net-next 5/5] be2net: call FLR after setup wol in be_shutdown Message-ID: <20110407040843.GA4247@akhaparde-VBox> Reply-To: Ajit Khaparde MIME-Version: 1.0 Content-Disposition: inline X-URL: http://www.emulex.com Organization: Emulex Corp User-Agent: "Ajit's Mutt" X-OS: Linux i686 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Calling setup_wol after a reset is inconsequential. The WOL setting should be programmed before FLR. And yes, FLR does not erase wol information. Signed-off-by: Ajit Khaparde --- drivers/net/benet/be_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 6a43b26..a7a2dec 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -3188,11 +3188,11 @@ static void be_shutdown(struct pci_dev *pdev) netif_device_detach(netdev); - be_cmd_reset_function(adapter); - if (adapter->wol) be_setup_wol(adapter, true); + be_cmd_reset_function(adapter); + pci_disable_device(pdev); }