igb: Explicitly label self-test result indices
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 4/5 igb: Explicitly label self-test result indices
From: Joe Schultz <[email protected]>
Previously, the ethtool self-test gstrings/data arrays were accessed via hardcoded indices, which made the code difficult to follow. This patch replaces the hardcoded values with enum-based labels.
--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 38 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/net/ethernet/intel/igb/igb_ethtool.c +24 -14
@@ -127,10 +127,20 @@ static const struct igb_stats igb_gstrings_net_stats[] = {#define IGB_STATS_LEN \ (IGB_GLOBAL_STATS_LEN + IGB_NETDEV_STATS_LEN + IGB_QUEUE_STATS_LEN) +enum igb_diagnostics_results { +TEST_REG =0 , +TEST_EEP , +TEST_IRQ , +TEST_LOOP , +TEST_LINK +}; +static const char igb_gstrings_test[][ETH_GSTRING_LEN ] = { -"Register test (offline)" ,"Eeprom test (offline)" , -"Interrupt test (offline)" ,"Loopback test (offline)" , -"Link test (on/offline)" + [TEST_REG ] ="Register test (offline)" , + [TEST_EEP ] ="Eeprom test (offline)" , + [TEST_IRQ ] ="Interrupt test (offline)" , + [TEST_LOOP ] ="Loopback test (offline)" , + [TEST_LINK ] ="Link test (on/offline)" };#define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN)
@@ -2006,7 +2016,7 @@ static void igb_diag_test(struct net_device *netdev,/* Link test performed before hardware reset so autoneg doesn't * interfere with test result */ -if (igb_link_test (adapter, &data[4 ])) +if (igb_link_test (adapter, &data[TEST_LINK ])) eth_test->flags |=ETH_TEST_FL_FAILED ;if (if_running)
@@ -2015,21 +2025,21 @@ static void igb_diag_test(struct net_device *netdev,else igb_reset (adapter); -if (igb_reg_test (adapter, &data[0 ])) +if (igb_reg_test (adapter, &data[TEST_REG ])) eth_test->flags |=ETH_TEST_FL_FAILED ;igb_reset (adapter); -if (igb_eeprom_test (adapter, &data[1 ])) +if (igb_eeprom_test (adapter, &data[TEST_EEP ])) eth_test->flags |=ETH_TEST_FL_FAILED ;igb_reset (adapter); -if (igb_intr_test (adapter, &data[2 ])) +if (igb_intr_test (adapter, &data[TEST_IRQ ])) eth_test->flags |=ETH_TEST_FL_FAILED ;igb_reset (adapter);/* power up link for loopback test */ igb_power_up_link (adapter); -if (igb_loopback_test (adapter, &data[3 ])) +if (igb_loopback_test (adapter, &data[TEST_LOOP ])) eth_test->flags |=ETH_TEST_FL_FAILED ;/* restore speed, duplex, autoneg settings */
@@ -2049,16 +2059,16 @@ static void igb_diag_test(struct net_device *netdev,dev_info (&adapter->pdev->dev,"online testing starting\n" );/* PHY is powered down when interface is down */ -if (if_running &&igb_link_test (adapter, &data[4 ])) +if (if_running &&igb_link_test (adapter, &data[TEST_LINK ])) eth_test->flags |=ETH_TEST_FL_FAILED ;else - data[4 ] =0 ; + data[TEST_LINK ] =0 ;/* Online tests aren't run; pass by default */ - data[0 ] =0 ; - data[1 ] =0 ; - data[2 ] =0 ; - data[3 ] =0 ; + data[TEST_REG ] =0 ; + data[TEST_EEP ] =0 ; + data[TEST_IRQ ] =0 ; + data[TEST_LOOP ] =0 ;clear_bit (__IGB_TESTING, &adapter->state); }
Signature · 1 line
1.9.1
Brown
PATCH 4/5 igb: Explicitly label self-test result indices
Quoted 12 lines
From: Intel-wired-lan [intel-wired-lan-bounces at lists.osuosl.org] on behalf of Aaron Sierra [asierra at xes-inc.com]
Sent: Tuesday, November 03, 2015 10:37 AM
To: Kirsher, Jeffrey T; intel-wired-lan at lists.osuosl.org
Cc: Joe Schultz
Subject: [Intel-wired-lan] [PATCH 4/5] igb: Explicitly label self-test result indicesFrom: Joe Schultz <[email protected]>
Previously, the ethtool self-test gstrings/data arrays were accessed via hardcoded indices, which made the code difficult to follow. This patch replaces the hardcoded values with enum-based labels.
Quoted 5 lines
Signed-off-by Joe Schultz <[email protected]>Signed-off-by Aaron Sierra <[email protected]>--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 38 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 14 deletions(-)