From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24C21C433DF for ; Fri, 9 Oct 2020 03:44:52 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 8044422240 for ; Fri, 9 Oct 2020 03:44:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8044422240 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D7F11BEE1; Fri, 9 Oct 2020 05:44:49 +0200 (CEST) Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by dpdk.org (Postfix) with ESMTP id D989A1BE89 for ; Fri, 9 Oct 2020 05:44:47 +0200 (CEST) Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 956C3D06CCF364D3FD1C; Fri, 9 Oct 2020 11:44:45 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 9 Oct 2020 11:44:35 +0800 From: "Min Hu (Connor)" To: CC: , , , , Date: Fri, 9 Oct 2020 11:45:19 +0800 Message-ID: <1602215119-64740-1-git-send-email-humin29@huawei.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH] app/testpmd: fix transmission from speed to str X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch uses a new 'rte_eth_link_speed_to_str()' API in the ethdev which enables removing above global 'eth_speed_name' array [1]. Fixes: 466c55e4d85b ("app/testpmd: add FEC command") Signed-off-by: Min Hu (Connor) --- app/test-pmd/config.c | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 7873426..8ccd989 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -161,36 +161,6 @@ static const struct { }, }; -static const struct { - uint32_t speed; - const char *name; -} eth_speed_name[] = { - { - .speed = ETH_SPEED_NUM_10G, - .name = "Speed 10G", - }, - { - .speed = ETH_SPEED_NUM_25G, - .name = "Speed 25G", - }, - { - .speed = ETH_SPEED_NUM_40G, - .name = "Speed 40G", - }, - { - .speed = ETH_SPEED_NUM_50G, - .name = "Speed 50G", - }, - { - .speed = ETH_SPEED_NUM_100G, - .name = "Speed 100G", - }, - { - .speed = ETH_SPEED_NUM_200G, - .name = "Speed 200G", - }, -}; - static void print_ethaddr(const char *name, struct rte_ether_addr *eth_addr) { @@ -3260,23 +3230,18 @@ parse_fec_mode(const char *name, uint32_t *mode) void show_fec_capability(unsigned int num, struct rte_eth_fec_capa *speed_fec_capa) { - unsigned int i, j, k; + unsigned int i, j; printf("FEC capabilities:\n"); for (i = 0; i < num; i++) { - for (j = 0; j < RTE_DIM(eth_speed_name); j++) { - if (eth_speed_name[j].speed == - speed_fec_capa[i].speed) { - printf("%s : ", eth_speed_name[j].name); - break; - } - } + printf("%s : ", + rte_eth_link_speed_to_str(speed_fec_capa[i].speed)); - for (k = RTE_ETH_FEC_AUTO; k < RTE_DIM(fec_mode_name); k++) { - if (RTE_ETH_FEC_MODE_TO_CAPA(k) & + for (j = RTE_ETH_FEC_AUTO; j < RTE_DIM(fec_mode_name); j++) { + if (RTE_ETH_FEC_MODE_TO_CAPA(j) & speed_fec_capa[i].capa) - printf("%s ", fec_mode_name[k].name); + printf("%s ", fec_mode_name[j].name); } printf("\n"); } -- 2.7.4