aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sfc/ethtool.c')
-rw-r--r--drivers/net/sfc/ethtool.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 9c533e036a00..931ce1410480 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -27,9 +27,9 @@ const char *efx_loopback_mode_names[] = {
27 [LOOPBACK_XGXS] = "XGXS", 27 [LOOPBACK_XGXS] = "XGXS",
28 [LOOPBACK_XAUI] = "XAUI", 28 [LOOPBACK_XAUI] = "XAUI",
29 [LOOPBACK_PHY] = "PHY", 29 [LOOPBACK_PHY] = "PHY",
30 [LOOPBACK_PHYXS] = "PHY(XS)", 30 [LOOPBACK_PHYXS] = "PHYXS",
31 [LOOPBACK_PCS] = "PHY(PCS)", 31 [LOOPBACK_PCS] = "PCS",
32 [LOOPBACK_PMAPMD] = "PHY(PMAPMD)", 32 [LOOPBACK_PMAPMD] = "PMA/PMD",
33 [LOOPBACK_NETWORK] = "NETWORK", 33 [LOOPBACK_NETWORK] = "NETWORK",
34}; 34};
35 35
@@ -242,10 +242,10 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
242 * @strings: Ethtool strings, or %NULL 242 * @strings: Ethtool strings, or %NULL
243 * @data: Ethtool test results, or %NULL 243 * @data: Ethtool test results, or %NULL
244 * @test: Pointer to test result (used only if data != %NULL) 244 * @test: Pointer to test result (used only if data != %NULL)
245 * @unit_format: Unit name format (e.g. "channel\%d") 245 * @unit_format: Unit name format (e.g. "chan\%d")
246 * @unit_id: Unit id (e.g. 0 for "channel0") 246 * @unit_id: Unit id (e.g. 0 for "chan0")
247 * @test_format: Test name format (e.g. "loopback.\%s.tx.sent") 247 * @test_format: Test name format (e.g. "loopback.\%s.tx.sent")
248 * @test_id: Test id (e.g. "PHY" for "loopback.PHY.tx_sent") 248 * @test_id: Test id (e.g. "PHYXS" for "loopback.PHYXS.tx_sent")
249 * 249 *
250 * Fill in an individual self-test entry. 250 * Fill in an individual self-test entry.
251 */ 251 */
@@ -268,12 +268,12 @@ static void efx_fill_test(unsigned int test_index,
268 test_format, test_id); 268 test_format, test_id);
269 snprintf(strings[test_index].name, 269 snprintf(strings[test_index].name,
270 sizeof(strings[test_index].name), 270 sizeof(strings[test_index].name),
271 "%-9s%-17s", unit_str.name, test_str.name); 271 "%-6s %-24s", unit_str.name, test_str.name);
272 } 272 }
273} 273}
274 274
275#define EFX_PORT_NAME "port%d", 0 275#define EFX_PORT_NAME "port%d", 0
276#define EFX_CHANNEL_NAME(_channel) "channel%d", _channel->channel 276#define EFX_CHANNEL_NAME(_channel) "chan%d", _channel->channel
277#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue 277#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue
278#define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue 278#define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue
279#define EFX_LOOPBACK_NAME(_mode, _counter) \ 279#define EFX_LOOPBACK_NAME(_mode, _counter) \