summaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorSarveshwar Bandi <sarveshwarb@serverengines.com>2009-08-12 21:01:29 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-13 16:26:09 -0700
commit9b0365f1954b0b54a896171b4438ed42ad7ef02f (patch)
tree4e17ac3c9f45a7c396f3b03c4670940597a50424 /drivers/net/benet
parentc458bc50e31631f7e9333ea6f1832fc54d4e2c1e (diff)
downloadblackbird-op-linux-9b0365f1954b0b54a896171b4438ed42ad7ef02f.tar.gz
blackbird-op-linux-9b0365f1954b0b54a896171b4438ed42ad7ef02f.zip
be2net:Creating/destroying queues regardless of netif_running() in suspend/resume path
Signed-off-by: sarveshwarb <sarveshwarb@serverengines.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 2db879c03c6d..45507d88e6a1 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1972,9 +1972,9 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
if (netif_running(netdev)) {
rtnl_lock();
be_close(netdev);
- be_clear(adapter);
rtnl_unlock();
}
+ be_clear(adapter);
pci_save_state(pdev);
pci_disable_device(pdev);
@@ -1997,9 +1997,9 @@ static int be_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);
+ be_setup(adapter);
if (netif_running(netdev)) {
rtnl_lock();
- be_setup(adapter);
be_open(netdev);
rtnl_unlock();
}
OpenPOWER on IntegriCloud