From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F9DEA046B for ; Tue, 23 Jul 2019 03:04:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 623E11BEF8; Tue, 23 Jul 2019 03:04:22 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 363B81BEF8 for ; Tue, 23 Jul 2019 03:04:21 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:04:18 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HgT026580; Tue, 23 Jul 2019 04:04:17 +0300 From: Yongseok Koh To: Ferruh Yigit Cc: dpdk stable Date: Mon, 22 Jul 2019 18:01:10 -0700 Message-Id: <20190723010115.6446-103-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: revert fixed flag for exact link speed' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Yongseok --- >From f9cc41bb20499bbbb44ac145ddc363c6e594e5f0 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Apr 2019 23:03:09 +0100 Subject: [PATCH] app/testpmd: revert fixed flag for exact link speed [ upstream commit f53cc91f412a6e22023f39e61a19039fad5ec3eb ] This reverts commit bdca79053b6aea504d02691d9319fa976062457f. Not all PMDs support the fixed link speed set, and link speed can be set even with auto negotiation enabled. Reverting the patch to not break existing usage. Fixes: bdca79053b6a ("app/testpmd: set fixed flag for exact link speed") Signed-off-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b007264e15..7a3a818723 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1318,17 +1318,17 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) return -1; } if (!strcmp(speedstr, "1000")) { - *speed = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_1G; } else if (!strcmp(speedstr, "10000")) { - *speed = ETH_LINK_SPEED_10G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_10G; } else if (!strcmp(speedstr, "25000")) { - *speed = ETH_LINK_SPEED_25G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_25G; } else if (!strcmp(speedstr, "40000")) { - *speed = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_40G; } else if (!strcmp(speedstr, "50000")) { - *speed = ETH_LINK_SPEED_50G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_50G; } else if (!strcmp(speedstr, "100000")) { - *speed = ETH_LINK_SPEED_100G | ETH_LINK_SPEED_FIXED; + *speed = ETH_LINK_SPEED_100G; } else if (!strcmp(speedstr, "auto")) { *speed = ETH_LINK_SPEED_AUTONEG; } else { -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:12.022051996 -0700 +++ 0103-app-testpmd-revert-fixed-flag-for-exact-link-speed.patch 2019-07-22 17:55:06.532475000 -0700 @@ -1,8 +1,10 @@ -From f53cc91f412a6e22023f39e61a19039fad5ec3eb Mon Sep 17 00:00:00 2001 +From f9cc41bb20499bbbb44ac145ddc363c6e594e5f0 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Apr 2019 23:03:09 +0100 Subject: [PATCH] app/testpmd: revert fixed flag for exact link speed +[ upstream commit f53cc91f412a6e22023f39e61a19039fad5ec3eb ] + This reverts commit bdca79053b6aea504d02691d9319fa976062457f. Not all PMDs support the fixed link speed set, and link speed can be set @@ -10,7 +12,6 @@ existing usage. Fixes: bdca79053b6a ("app/testpmd: set fixed flag for exact link speed") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- @@ -18,10 +19,10 @@ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c -index f45ef8a1c7..c1042dd982 100644 +index b007264e15..7a3a818723 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c -@@ -1533,17 +1533,17 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) +@@ -1318,17 +1318,17 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) return -1; } if (!strcmp(speedstr, "1000")) {