Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184288
b: refs/heads/master
c: 82456b0
h: refs/heads/master
v: v3
  • Loading branch information
Sathya Perla authored and David S. Miller committed Feb 17, 2010
1 parent 3d2102f commit 1a9879d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89420424fce28769c338909393518087befe8b37
refs/heads/master: 82456b031e3c3b5bf95a7e49bd9b68b146446e76
21 changes: 21 additions & 0 deletions trunk/drivers/net/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2449,6 +2449,26 @@ static int be_resume(struct pci_dev *pdev)
return 0;
}

/*
* An FLR will stop BE from DMAing any data.
*/
static void be_shutdown(struct pci_dev *pdev)
{
struct be_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;

netif_device_detach(netdev);

be_cmd_reset_function(adapter);

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

pci_disable_device(pdev);

return;
}

static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
pci_channel_state_t state)
{
Expand Down Expand Up @@ -2544,6 +2564,7 @@ static struct pci_driver be_driver = {
.remove = be_remove,
.suspend = be_suspend,
.resume = be_resume,
.shutdown = be_shutdown,
.err_handler = &be_eeh_handlers
};

Expand Down

0 comments on commit 1a9879d

Please sign in to comment.