microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

sfc: Abbreviate self-test names so they are not truncated 

Change "channel" to "chan".

Shorten PHY loopback names.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2008-12-12 21:41:55 -08:00 коммит произвёл David S. Miller
Родитель 56536e9ce7
Коммит 740ced9927
1 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
drivers/net/sfc/ethtool.c
Просмотреть файл

@ -27,9 +27,9 @@ const char *efx_loopback_mode_names[] = {
[LOOPBACK_XGXS] = "XGXS", [LOOPBACK_XGXS] = "XGXS",
[LOOPBACK_XAUI] = "XAUI", [LOOPBACK_XAUI] = "XAUI",
[LOOPBACK_PHY] = "PHY", [LOOPBACK_PHY] = "PHY",
[LOOPBACK_PHYXS] = "PHY(XS)", [LOOPBACK_PHYXS] = "PHYXS",
[LOOPBACK_PCS] = "PHY(PCS)", [LOOPBACK_PCS] = "PCS",
[LOOPBACK_PMAPMD] = "PHY(PMAPMD)", [LOOPBACK_PMAPMD] = "PMA/PMD",
[LOOPBACK_NETWORK] = "NETWORK", [LOOPBACK_NETWORK] = "NETWORK",
}; };
@ -242,10 +242,10 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
* @strings: Ethtool strings, or %NULL * @strings: Ethtool strings, or %NULL
* @data: Ethtool test results, or %NULL * @data: Ethtool test results, or %NULL
* @test: Pointer to test result (used only if data != %NULL) * @test: Pointer to test result (used only if data != %NULL)
* @unit_format: Unit name format (e.g. "channel\%d") * @unit_format: Unit name format (e.g. "chan\%d")
* @unit_id: Unit id (e.g. 0 for "channel0") * @unit_id: Unit id (e.g. 0 for "chan0")
* @test_format: Test name format (e.g. "loopback.\%s.tx.sent") * @test_format: Test name format (e.g. "loopback.\%s.tx.sent")
* @test_id: Test id (e.g. "PHY" for "loopback.PHY.tx_sent") * @test_id: Test id (e.g. "PHYXS" for "loopback.PHYXS.tx_sent")
* *
* Fill in an individual self-test entry. * Fill in an individual self-test entry.
*/ */
@ -268,12 +268,12 @@ static void efx_fill_test(unsigned int test_index,
test_format, test_id); test_format, test_id);
snprintf(strings[test_index].name, snprintf(strings[test_index].name,
sizeof(strings[test_index].name), sizeof(strings[test_index].name),
"%-9s%-17s", unit_str.name, test_str.name); "%-6s %-24s", unit_str.name, test_str.name);
} }
} }
#define EFX_PORT_NAME "port%d", 0 #define EFX_PORT_NAME "port%d", 0
#define EFX_CHANNEL_NAME(_channel) "channel%d", _channel->channel #define EFX_CHANNEL_NAME(_channel) "chan%d", _channel->channel
#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue #define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue
#define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue #define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue
#define EFX_LOOPBACK_NAME(_mode, _counter) \ #define EFX_LOOPBACK_NAME(_mode, _counter) \