Skip to content

Commit

Permalink
be2net: fix be_suspend/resume/shutdown
Browse files Browse the repository at this point in the history
> call pci msix disable in be_suspend
	> call pci msix enable in be_resume
	> stop worker thread in be_suspend
	> start worker thread in be_resume
	> stop worker thread in be_shutdown

Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ajit Khaparde authored and David S. Miller committed Feb 12, 2011
1 parent fae21a4 commit a4ca055
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/net/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3023,6 +3023,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
struct be_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;

cancel_delayed_work_sync(&adapter->work);
if (adapter->wol)
be_setup_wol(adapter, true);

Expand All @@ -3035,6 +3036,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
be_cmd_get_flow_control(adapter, &adapter->tx_fc, &adapter->rx_fc);
be_clear(adapter);

be_msix_disable(adapter);
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
Expand All @@ -3056,6 +3058,7 @@ static int be_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);

be_msix_enable(adapter);
/* tell fw we're ready to fire cmds */
status = be_cmd_fw_init(adapter);
if (status)
Expand All @@ -3071,6 +3074,8 @@ static int be_resume(struct pci_dev *pdev)

if (adapter->wol)
be_setup_wol(adapter, false);

schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
return 0;
}

Expand All @@ -3082,6 +3087,9 @@ static void be_shutdown(struct pci_dev *pdev)
struct be_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;

if (netif_running(netdev))
cancel_delayed_work_sync(&adapter->work);

netif_device_detach(netdev);

be_cmd_reset_function(adapter);
Expand Down

0 comments on commit a4ca055

Please sign in to comment.