From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 634021B411 for ; Fri, 23 Nov 2018 11:30:58 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6DB1308624B; Fri, 23 Nov 2018 10:30:57 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3472D17DA1; Fri, 23 Nov 2018 10:30:55 +0000 (UTC) From: Kevin Traynor To: Wei Zhao Cc: Yuan Peng , dpdk stable Date: Fri, 23 Nov 2018 10:27:12 +0000 Message-Id: <20181123102713.17309-68-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 23 Nov 2018 10:30:57 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix Rx offload search' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Fri, 23 Nov 2018 10:30:58 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From deaa87d24e7e9f4f0f88ad8c7f85fbb2f8f335e0 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 7 Nov 2018 14:14:29 +0800 Subject: [PATCH] app/testpmd: fix Rx offload search [ upstream commit 054075ea9031edb5d3355cb76e821c0794410ca4 ] There is an error in function search_rx_offload(), it will break when get unexpected return value from function rte_eth_dev_rx_offload_name(), but rte_eth_dev_rx_offload_name() will return some unexpected value indeed. Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API") Signed-off-by: Wei Zhao Tested-by: Yuan Peng --- app/test-pmd/cmdline.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 3b24aac8b..18612d763 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -17406,8 +17406,5 @@ search_tx_offload(const char *name) found = 1; break; - } else if (!strcasecmp(single_name, "UNKNOWN")) - break; - else if (single_name == NULL) - break; + } single_offload <<= 1; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:55.998193222 +0000 +++ 0068-app-testpmd-fix-Rx-offload-search.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,15 +1,16 @@ -From 054075ea9031edb5d3355cb76e821c0794410ca4 Mon Sep 17 00:00:00 2001 +From deaa87d24e7e9f4f0f88ad8c7f85fbb2f8f335e0 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 7 Nov 2018 14:14:29 +0800 Subject: [PATCH] app/testpmd: fix Rx offload search +[ upstream commit 054075ea9031edb5d3355cb76e821c0794410ca4 ] + There is an error in function search_rx_offload(), it will break when get unexpected return value from function rte_eth_dev_rx_offload_name(), but rte_eth_dev_rx_offload_name() will return some unexpected value indeed. Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Tested-by: Yuan Peng @@ -18,10 +19,10 @@ 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c -index 5e08a1b9b..127507410 100644 +index 3b24aac8b..18612d763 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c -@@ -17806,8 +17806,5 @@ search_rx_offload(const char *name) +@@ -17406,8 +17406,5 @@ search_tx_offload(const char *name) found = 1; break; - } else if (!strcasecmp(single_name, "UNKNOWN"))