[dpdk-stable] patch 'mbuf: update Tx VLAN and QinQ flags documentation' 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 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Tue, 2 Apr 2019 18:09:46 +0100
Subject: [PATCH] mbuf: update Tx VLAN and QinQ flags documentation

[ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ]

Currently PKT_TX_VLAN and PKT_TX_QINQ mbuf flags are documented as
they are to say packet contains VLAN or QINQ information.

Updating the definition as they are requests from application to
driver to insert VLAN or double VLAN tags into packet.

Fixes: dc6c911c9993 ("mbuf: use reserved space for double vlan")
Fixes: af75078fece3 ("first public release")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_mbuf/rte_mbuf.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 795015c81..c3bf2fe6d 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -280,7 +280,9 @@ extern "C" {
 
 /**
- * Second VLAN insertion (QinQ) flag.
+ * Double VLAN insertion (QinQ) request to driver, driver may offload the
+ * insertion based on device capability.
+ * mbuf 'vlan_tci' & 'vlan_tci_outer' must be valid when this flag is set.
  */
-#define PKT_TX_QINQ        (1ULL << 49)   /**< TX packet with double VLAN inserted. */
+#define PKT_TX_QINQ        (1ULL << 49)
 /* this old name is deprecated */
 #define PKT_TX_QINQ_PKT    PKT_TX_QINQ
@@ -338,5 +340,7 @@ extern "C" {
 
 /**
- * TX packet is a 802.1q VLAN packet.
+ * VLAN tag insertion request to driver, driver may offload the insertion
+ * based on the device capability.
+ * mbuf 'vlan_tci' field must be valid when this flag is set.
  */
 #define PKT_TX_VLAN          (1ULL << 57)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.608608074 +0100
+++ 0038-mbuf-update-Tx-VLAN-and-QinQ-flags-documentation.patch	2019-04-30 17:58:13.835139206 +0100
@@ -1 +1 @@
-From 00cc9701e4d3390f80d5f7e8109587fe342718a9 Mon Sep 17 00:00:00 2001
+From 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index f7886dcb3..a6c4a5e18 100644
+index 795015c81..c3bf2fe6d 100644
@@ -26 +27 @@
-@@ -281,7 +281,9 @@ extern "C" {
+@@ -280,7 +280,9 @@ extern "C" {
@@ -38 +39 @@
-@@ -339,5 +341,7 @@ extern "C" {
+@@ -338,5 +340,7 @@ extern "C" {