projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48f5a19
)
be2net: call FLR after setup wol in be_shutdown
author
Ajit Khaparde
<ajit.khaparde@emulex.com>
Wed, 6 Apr 2011 18:08:43 +0000
(18:08 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 7 Apr 2011 22:05:00 +0000
(15:05 -0700)
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>
drivers/net/benet/be_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/benet/be_main.c
b/drivers/net/benet/be_main.c
index
6e7df0d
..
b883140
100644
(file)
--- 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);
}