[dpdk-stable] patch 'app/testpmd: fix Tx VLAN and QinQ dependency' 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 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram at marvell.com>
Date: Fri, 5 Apr 2019 07:36:21 +0000
Subject: [PATCH] app/testpmd: fix Tx VLAN and QinQ dependency

[ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ]

Tx VLAN & QinQ insert enable need not depend on
Rx VLAN offload ETH_VLAN_EXTEND_OFFLOAD. For Tx VLAN
insert enable, error check is now to see if QinQ was enabled
but only single VLAN id is set.

Fixes: 6a34f91690d0 ("app/testpmd: fix error message when setting Tx VLAN")

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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index b9e5dd923..5397acbd1 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2956,5 +2956,4 @@ void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
-	int vlan_offload;
 	struct rte_eth_dev_info dev_info;
 
@@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 		return;
 
-	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
-	if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) {
+	if (ports[port_id].dev_conf.txmode.offloads &
+	    DEV_TX_OFFLOAD_QINQ_INSERT) {
 		printf("Error, as QinQ has been enabled.\n");
 		return;
@@ -2984,5 +2983,4 @@ void
 tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 {
-	int vlan_offload;
 	struct rte_eth_dev_info dev_info;
 
@@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 		return;
 
-	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
-	if (!(vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)) {
-		printf("Error, as QinQ hasn't been enabled.\n");
-		return;
-	}
 	rte_eth_dev_info_get(port_id, &dev_info);
 	if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) == 0) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.198035581 +0100
+++ 0008-app-testpmd-fix-Tx-VLAN-and-QinQ-dependency.patch	2019-04-30 17:58:13.760140742 +0100
@@ -1 +1 @@
-From 368ba98aead8fc1c84e65cbf43338b4bcc856364 Mon Sep 17 00:00:00 2001
+From 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index cadcb512f..010e26d4c 100644
+index b9e5dd923..5397acbd1 100644
@@ -25 +26 @@
-@@ -2963,5 +2963,4 @@ void
+@@ -2956,5 +2956,4 @@ void
@@ -31 +32 @@
-@@ -2971,6 +2970,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
+@@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
@@ -40 +41 @@
-@@ -2991,5 +2990,4 @@ void
+@@ -2984,5 +2983,4 @@ void
@@ -46 +47 @@
-@@ -3001,9 +2999,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
+@@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)