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 96B2A1B488 for ; Thu, 22 Nov 2018 17:53:24 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04E8C307D860; Thu, 22 Nov 2018 16:53:24 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C68B060FD9; Thu, 22 Nov 2018 16:53:22 +0000 (UTC) From: Kevin Traynor To: Jerin Jacob Cc: Ferruh Yigit , dpdk stable Date: Thu, 22 Nov 2018 16:49:52 +0000 Message-Id: <20181122164957.13003-60-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 22 Nov 2018 16:53:24 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix QinQ strip display option' 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: Thu, 22 Nov 2018 16:53:25 -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/28/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 e61584e9105918409c9417f3eca497c4d449958f Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Fri, 26 Oct 2018 12:40:32 +0000 Subject: [PATCH] app/testpmd: fix QinQ strip display option [ upstream commit a72a1ef34e75f40efc0a2051f55d555af9138e9c ] Fix a typo on DEV_RX_OFFLOAD_QINQ_STRIP selection. Fixes: 0074d02fca21 ("app/testpmd: convert to new Rx offloads API") Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit --- app/test-pmd/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a08a4a5d9..4d2f00f1b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -544,5 +544,5 @@ port_offload_cap_display(portid_t port_id) printf("Double VLANs stripped: "); if (ports[port_id].dev_conf.rxmode.offloads & - DEV_RX_OFFLOAD_VLAN_EXTEND) + DEV_RX_OFFLOAD_QINQ_STRIP) printf("on\n"); else -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.844584747 +0000 +++ 0060-app-testpmd-fix-QinQ-strip-display-option.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,12 +1,13 @@ -From a72a1ef34e75f40efc0a2051f55d555af9138e9c Mon Sep 17 00:00:00 2001 +From e61584e9105918409c9417f3eca497c4d449958f Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Fri, 26 Oct 2018 12:40:32 +0000 Subject: [PATCH] app/testpmd: fix QinQ strip display option +[ upstream commit a72a1ef34e75f40efc0a2051f55d555af9138e9c ] + Fix a typo on DEV_RX_OFFLOAD_QINQ_STRIP selection. Fixes: 0074d02fca21 ("app/testpmd: convert to new Rx offloads API") -Cc: stable@dpdk.org Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c -index 56afe46c0..b9e5dd923 100644 +index a08a4a5d9..4d2f00f1b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c -@@ -588,5 +588,5 @@ port_offload_cap_display(portid_t port_id) +@@ -544,5 +544,5 @@ port_offload_cap_display(portid_t port_id) printf("Double VLANs stripped: "); if (ports[port_id].dev_conf.rxmode.offloads & - DEV_RX_OFFLOAD_VLAN_EXTEND)