aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_ethtool.c
diff options
context:
space:
mode:
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 cfdf0b24ffc1..6ed7f599eba3 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)
871 *data = 0; 871 *data = 0;
872 872
873 /* Hook up test interrupt handler just for this test */ 873 /* Hook up test interrupt handler just for this test */
874 if (!request_irq(irq, &e1000_test_intr, 0, netdev->name, netdev)) { 874 if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
875 shared_int = FALSE; 875 netdev)) {
876 } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ, 876 shared_int = FALSE;
877 } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
877 netdev->name, netdev)){ 878 netdev->name, netdev)){
878 *data = 1; 879 *data = 1;
879 return -1; 880 return -1;
880 } 881 }
882 DPRINTK(PROBE,INFO, "testing %s interrupt\n",
883 (shared_int ? "shared" : "unshared"));
881 884
882 /* Disable all the interrupts */ 885 /* Disable all the interrupts */
883 E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF); 886 E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF);