From: Ajit Khaparde Date: Wed, 6 Apr 2011 18:08:43 +0000 (+0000) Subject: be2net: call FLR after setup wol in be_shutdown X-Git-Tag: MMI-PSA29.97-13-9~18929^2~641 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57841869197831542f25c739beaeab4465977878;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git be2net: call FLR after setup wol in be_shutdown 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 6e7df0dd418b..b8831403400c 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -3191,11 +3191,11 @@ static void be_shutdown(struct pci_dev *pdev) netif_device_detach(adapter->netdev); - be_cmd_reset_function(adapter); - if (adapter->wol) be_setup_wol(adapter, true); + be_cmd_reset_function(adapter); + pci_disable_device(pdev); }