History

qlcnic: Fix external loopback test.

Driver was not handling external loopback diagnostic test request.

Shahed Shaikh committed 13 years ago

Commit 2e3ea7e1 parent 01b91f41 file · +10 −2Browse files

Unified · Split

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c+10−2
@@ -150,6 +150,7 @@ static const char qlcnic_gstrings_test[][ETH_GSTRING_LEN] = { · 149 unmodified lines
150150 "Link_Test_on_offline",
151151 "Interrupt_Test_offline",
152152 "Internal_Loopback_offline",
153+ "External_Loopback_offline",
153154 "EEPROM_Test_offline"
154155 };
155156
@@ -1026,8 +1027,15 @@ qlcnic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, · 870 unmodified lines
10261027 if (data[3])
10271028 eth_test->flags |= ETH_TEST_FL_FAILED;
10281029
1029− data[4] = qlcnic_eeprom_test(dev);
1030− if (data[4])
1030+ if (eth_test->flags & ETH_TEST_FL_EXTERNAL_LB) {
1031+ data[4] = qlcnic_loopback_test(dev, QLCNIC_ELB_MODE);
1032+ if (data[4])
1033+ eth_test->flags |= ETH_TEST_FL_FAILED;
1034+ eth_test->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE;
1035+ }
1036+
1037+ data[5] = qlcnic_eeprom_test(dev);
1038+ if (data[5])
10311039 eth_test->flags |= ETH_TEST_FL_FAILED;
10321040 }
10331041 }