Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 134320
b: refs/heads/master
c: b6e4405
h: refs/heads/master
v: v3
  • Loading branch information
Ayaz Abdulla authored and David S. Miller committed Feb 7, 2009
1 parent a869175 commit 708d91f
Show file tree
Hide file tree
Showing 2 changed files with 6 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: cac1c52c3621b46e3be49cf7887a7cfa393890de
refs/heads/master: b6e4405bf7241ae91c497e021370066fcfb196c8
5 changes: 5 additions & 0 deletions trunk/drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,9 @@ union ring_type {
#define NV_MSI_X_VECTOR_TX 0x1
#define NV_MSI_X_VECTOR_OTHER 0x2

#define NV_MSI_PRIV_OFFSET 0x68
#define NV_MSI_PRIV_VALUE 0xffffffff

#define NV_RESTART_TX 0x1
#define NV_RESTART_RX 0x2

Expand Down Expand Up @@ -6074,6 +6077,8 @@ static int nv_resume(struct pci_dev *pdev)
for (i = 0;i <= np->register_size/sizeof(u32); i++)
writel(np->saved_config_space[i], base+i*sizeof(u32));

pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);

netif_device_attach(dev);
if (netif_running(dev)) {
rc = nv_open(dev);
Expand Down

0 comments on commit 708d91f

Please sign in to comment.