aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/e1000/e1000_ethtool.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-08 15:55:45 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-08 15:55:45 -0400
commitbcd618e4eac6fbf82de05d23c15ecb694c62b8af (patch)
treee1a85b6a5f10c7ac20ef3b3357e15c5802dca019 /drivers/net/e1000/e1000_ethtool.c
parentba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 (diff)
parentcb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a (diff)
Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/net/e1000/e1000_ethtool.c
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index cfdf0b24ffc..6ed7f599eba 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -871,13 +871,16 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
*data = 0;
/* Hook up test interrupt handler just for this test */
- if (!request_irq(irq, &e1000_test_intr, 0, netdev->name, netdev)) {
- shared_int = FALSE;
- } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
+ if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
+ netdev)) {
+ shared_int = FALSE;
+ } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
netdev->name, netdev)){
*data = 1;
return -1;
}
+ DPRINTK(PROBE,INFO, "testing %s interrupt\n",
+ (shared_int ? "shared" : "unshared"));
/* Disable all the interrupts */
E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF);