From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 336D6A0A02 for ; Mon, 17 May 2021 18:15:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DAE8410E2; Mon, 17 May 2021 18:15:06 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 4FCF9410E2 for ; Mon, 17 May 2021 18:15:05 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liftW-00087o-0R; Mon, 17 May 2021 16:15:02 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Min Hu , Ferruh Yigit , Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:09:02 +0200 Message-Id: <20210517161039.3132619-113-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix bitmap of link speeds when force speed' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0bd755a5b369ec87c36ad2023f448108d8940b3a Thanks. Christian Ehrhardt --- >From 0bd755a5b369ec87c36ad2023f448108d8940b3a Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 14 Apr 2021 11:02:05 +0800 Subject: [PATCH] app/testpmd: fix bitmap of link speeds when force speed [ upstream commit 312312e928c71cb6b45aeaab2b421d059897dd07 ] Currently, when the user sets force link speed through 'link_speeds', bit(0) of 'link_speeds' is not set to 1(ETH_LINK_SPEED_FIXED), which conflicts with the definition. Fixes: 88fbedcd5e5a ("app/testpmd: move speed and duplex parsing in a function") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) Acked-by: Ferruh Yigit Acked-by: Ajit Khaparde --- app/test-pmd/cmdline.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index ecf36a7c67..d301971b2f 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1618,6 +1618,9 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) } } + if (*speed != ETH_LINK_SPEED_AUTONEG) + *speed |= ETH_LINK_SPEED_FIXED; + return 0; } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.859427792 +0200 +++ 0113-app-testpmd-fix-bitmap-of-link-speeds-when-force-spe.patch 2021-05-17 17:40:29.331810737 +0200 @@ -1 +1 @@ -From 312312e928c71cb6b45aeaab2b421d059897dd07 Mon Sep 17 00:00:00 2001 +From 0bd755a5b369ec87c36ad2023f448108d8940b3a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 312312e928c71cb6b45aeaab2b421d059897dd07 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index ec98ccc652..5bf1497f2b 100644 +index ecf36a7c67..d301971b2f 100644 @@ -25 +26 @@ -@@ -1525,6 +1525,9 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) +@@ -1618,6 +1618,9 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)