From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id D4F1FA0096 for ; Wed, 8 May 2019 12:16:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB01737B7; Wed, 8 May 2019 12:16:06 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2437E2862 for ; Wed, 8 May 2019 12:16:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 744AD301EA94; Wed, 8 May 2019 10:16:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C8C8410E; Wed, 8 May 2019 10:16:03 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Bernard Iremonger , dpdk stable Date: Wed, 8 May 2019 11:14:53 +0100 Message-Id: <20190508101534.8984-11-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 08 May 2019 10:16:04 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: set fixed flag for exact link speed' has been queued to LTS release 18.11.2 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 18.11.2 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/13/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/fee50d95b9f544f48487546cf597668ebfba6a6d Thanks. Kevin Traynor --- >From fee50d95b9f544f48487546cf597668ebfba6a6d Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 12 Apr 2019 14:12:33 +0100 Subject: [PATCH] app/testpmd: set fixed flag for exact link speed [ upstream commit bdca79053b6aea504d02691d9319fa976062457f ] Setting exact link speed makes sense if auto-negotiation is disabled. Fixed flag is required to disable auto-negotiation. Fixes: 88fbedcd5e5a ("app/testpmd: move speed and duplex parsing in a function") Signed-off-by: Andrew Rybchenko Acked-by: Bernard Iremonger --- 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 f17ca3282..5d719a186 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1430,15 +1430,15 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) } if (!strcmp(speedstr, "1000")) { - *speed = ETH_LINK_SPEED_1G; + *speed = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "10000")) { - *speed = ETH_LINK_SPEED_10G; + *speed = ETH_LINK_SPEED_10G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "25000")) { - *speed = ETH_LINK_SPEED_25G; + *speed = ETH_LINK_SPEED_25G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "40000")) { - *speed = ETH_LINK_SPEED_40G; + *speed = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "50000")) { - *speed = ETH_LINK_SPEED_50G; + *speed = ETH_LINK_SPEED_50G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "100000")) { - *speed = ETH_LINK_SPEED_100G; + *speed = ETH_LINK_SPEED_100G | ETH_LINK_SPEED_FIXED; } else if (!strcmp(speedstr, "auto")) { *speed = ETH_LINK_SPEED_AUTONEG; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.412762791 +0100 +++ 0011-app-testpmd-set-fixed-flag-for-exact-link-speed.patch 2019-05-08 11:05:05.786933661 +0100 @@ -1 +1 @@ -From bdca79053b6aea504d02691d9319fa976062457f Mon Sep 17 00:00:00 2001 +From fee50d95b9f544f48487546cf597668ebfba6a6d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bdca79053b6aea504d02691d9319fa976062457f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 2ab03c111..691d818a6 100644 +index f17ca3282..5d719a186 100644 @@ -22 +23 @@ -@@ -1441,15 +1441,15 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) +@@ -1430,15 +1430,15 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)