From: Sarveshwar Bandi <sarveshwarb@serverengines.com>
Date: Wed, 12 Aug 2009 21:01:29 +0000 (+0000)
Subject: be2net:Creating/destroying queues regardless of netif_running() in suspend/resume... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b0365f1954b0b54a896171b4438ed42ad7ef02f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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();
 	}