Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277589
b: refs/heads/master
c: 8932878
h: refs/heads/master
i:
  277587: ab40b1d
v: v3
  • Loading branch information
Mike Ditto authored and David S. Miller committed Nov 17, 2011
1 parent 1bfca87 commit f00954a
Show file tree
Hide file tree
Showing 2 changed files with 3 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: ccf5ff69fbbd8d877377f5786369cf5aa78a15fc
refs/heads/master: 8932878339f02f822ef613068c50127f7be87122
2 changes: 2 additions & 0 deletions trunk/drivers/net/ethernet/nvidia/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3810,6 +3810,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
writel(0, base + NvRegMSIXMap0);
writel(0, base + NvRegMSIXMap1);
}
netdev_info(dev, "MSI-X enabled\n");
}
}
if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {
Expand All @@ -3831,6 +3832,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
writel(0, base + NvRegMSIMap1);
/* enable msi vector 0 */
writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask);
netdev_info(dev, "MSI enabled\n");
}
}
if (ret != 0) {
Expand Down

0 comments on commit f00954a

Please sign in to comment.