[dpdk-stable] patch 'app/testpmd: fix Tx QinQ set' has been queued to LTS release 18.11.2

[Kevin Traynor]

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 <ndabilpuram at marvell.com>
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 <ndabilpuram at marvell.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 at 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)