diff options
| author | Ajit Khaparde <ajit.khaparde@emulex.com> | 2011-04-06 18:08:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-07 15:05:00 -0700 |
| commit | 57841869197831542f25c739beaeab4465977878 (patch) | |
| tree | 90d282ad0691b8b85f97fbe75e6ad8cde98c1178 /drivers/net/benet | |
| parent | 48f5a19168c228e6533401c563d9fcbc152bc33f (diff) | |
| download | kernel_samsung_smdk4412-57841869197831542f25c739beaeab4465977878.zip kernel_samsung_smdk4412-57841869197831542f25c739beaeab4465977878.tar.gz kernel_samsung_smdk4412-57841869197831542f25c739beaeab4465977878.tar.bz2 | |
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 <ajit.khaparde@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | 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 6e7df0d..b883140 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); } |