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 50812A0679 for ; Tue, 30 Apr 2019 19:02:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 446CF5A6E; Tue, 30 Apr 2019 19:02:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D681D5B12 for ; Tue, 30 Apr 2019 19:01:59 +0200 (CEST) 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 45A33C075D75; Tue, 30 Apr 2019 17:01:59 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14AC96D0A2; Tue, 30 Apr 2019 17:01:57 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Bernard Iremonger , Ferruh Yigit , dpdk stable Date: Tue, 30 Apr 2019 18:01:04 +0100 Message-Id: <20190430170133.2331-9-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-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.32]); Tue, 30 Apr 2019 17:01:59 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix Tx QinQ set' 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/07/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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From c469a27cf315c2caa9ab9f01fd3ed8ad649905bf Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Fri, 5 Apr 2019 07:36:24 +0000 Subject: [PATCH] app/testpmd: fix Tx QinQ set [ upstream commit 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc ] Enable DEV_TX_OFFLOAD_VLAN_INSERT also along with DEV_TX_OFFLOAD_VLAN_QINQ in tx_qinq_set() as it takes both vlan id's as arguments. Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API") Signed-off-by: Nithin Dabilpuram Acked-by: Bernard Iremonger Reviewed-by: Ferruh Yigit --- app/test-pmd/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 5397acbd1..4004e3a49 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3000,5 +3000,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) tx_vlan_reset(port_id); - ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_QINQ_INSERT; + ports[port_id].dev_conf.txmode.offloads |= (DEV_TX_OFFLOAD_VLAN_INSERT | + DEV_TX_OFFLOAD_QINQ_INSERT); ports[port_id].tx_vlan_id = vlan_id; ports[port_id].tx_vlan_id_outer = vlan_id_outer; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.244429207 +0100 +++ 0009-app-testpmd-fix-Tx-QinQ-set.patch 2019-04-30 17:58:13.764140660 +0100 @@ -1 +1 @@ -From 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc Mon Sep 17 00:00:00 2001 +From c469a27cf315c2caa9ab9f01fd3ed8ad649905bf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 010e26d4c..f9cb12964 100644 +index 5397acbd1..4004e3a49 100644 @@ -24 +25 @@ -@@ -3007,5 +3007,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) +@@ -3000,5 +3000,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)