Message ID | 20090813070119.GA28043@serverengines.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Sarveshwar Bandi <sarveshwarb@serverengines.com> Date: Thu, 13 Aug 2009 12:31:29 +0530 > Signed-off-by: sarveshwarb <sarveshwarb@serverengines.com> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 2db879c..45507d8 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 *pd 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 *pde 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(); }
Signed-off-by: sarveshwarb <sarveshwarb@serverengines.com> --- drivers/net/benet/be_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)