Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211101
b: refs/heads/master
c: ec5a32f
h: refs/heads/master
i:
  211099: 27fb517
v: v3
  • Loading branch information
Luca Tettamanti authored and David S. Miller committed Sep 22, 2010
1 parent 8e448f0 commit d59cb7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56b49f4b8f6728b91d10c556c116175051b77b60
refs/heads/master: ec5a32f67c603b11d68eb283d94eb89a4f6cfce1
5 changes: 3 additions & 2 deletions trunk/drivers/net/atlx/atl1.c
Original file line number Diff line number Diff line change
Expand Up @@ -2847,10 +2847,11 @@ static int atl1_resume(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D3cold, 0);

atl1_reset_hw(&adapter->hw);
adapter->cmb.cmb->int_stats = 0;

if (netif_running(netdev))
if (netif_running(netdev)) {
adapter->cmb.cmb->int_stats = 0;
atl1_up(adapter);
}
netif_device_attach(netdev);

return 0;
Expand Down

0 comments on commit d59cb7f

Please sign in to comment.