diff options
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index e48dc578fde2..cfdf0b24ffc1 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -865,15 +865,15 @@ static int | |||
865 | e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) | 865 | e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) |
866 | { | 866 | { |
867 | struct net_device *netdev = adapter->netdev; | 867 | struct net_device *netdev = adapter->netdev; |
868 | uint32_t mask, i=0, shared_int = TRUE; | 868 | uint32_t mask, i=0, shared_int = TRUE; |
869 | uint32_t irq = adapter->pdev->irq; | 869 | uint32_t irq = adapter->pdev->irq; |
870 | 870 | ||
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, 0, netdev->name, netdev)) { |
875 | shared_int = FALSE; | 875 | shared_int = FALSE; |
876 | } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ, | 876 | } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ, |
877 | netdev->name, netdev)){ | 877 | netdev->name, netdev)){ |
878 | *data = 1; | 878 | *data = 1; |
879 | return -1; | 879 | return -1; |
@@ -889,22 +889,22 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) | |||
889 | /* Interrupt to test */ | 889 | /* Interrupt to test */ |
890 | mask = 1 << i; | 890 | mask = 1 << i; |
891 | 891 | ||
892 | if (!shared_int) { | 892 | if (!shared_int) { |
893 | /* Disable the interrupt to be reported in | 893 | /* Disable the interrupt to be reported in |
894 | * the cause register and then force the same | 894 | * the cause register and then force the same |
895 | * interrupt and see if one gets posted. If | 895 | * interrupt and see if one gets posted. If |
896 | * an interrupt was posted to the bus, the | 896 | * an interrupt was posted to the bus, the |
897 | * test failed. | 897 | * test failed. |
898 | */ | 898 | */ |
899 | adapter->test_icr = 0; | 899 | adapter->test_icr = 0; |
900 | E1000_WRITE_REG(&adapter->hw, IMC, mask); | 900 | E1000_WRITE_REG(&adapter->hw, IMC, mask); |
901 | E1000_WRITE_REG(&adapter->hw, ICS, mask); | 901 | E1000_WRITE_REG(&adapter->hw, ICS, mask); |
902 | msec_delay(10); | 902 | msec_delay(10); |
903 | 903 | ||
904 | if (adapter->test_icr & mask) { | 904 | if (adapter->test_icr & mask) { |
905 | *data = 3; | 905 | *data = 3; |
906 | break; | 906 | break; |
907 | } | 907 | } |
908 | } | 908 | } |
909 | 909 | ||
910 | /* Enable the interrupt to be reported in | 910 | /* Enable the interrupt to be reported in |
@@ -923,7 +923,7 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) | |||
923 | break; | 923 | break; |
924 | } | 924 | } |
925 | 925 | ||
926 | if (!shared_int) { | 926 | if (!shared_int) { |
927 | /* Disable the other interrupts to be reported in | 927 | /* Disable the other interrupts to be reported in |
928 | * the cause register and then force the other | 928 | * the cause register and then force the other |
929 | * interrupts and see if any get posted. If | 929 | * interrupts and see if any get posted. If |