patch 'mbuf: dump outer VLAN' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/23/22. 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 are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/de28f76399f2f683a8802305c2250cf862979f70

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From de28f76399f2f683a8802305c2250cf862979f70 Mon Sep 17 00:00:00 2001
From: Ben Magistro <koncept1 at gmail.com>
Date: Mon, 4 Apr 2022 00:56:35 +0000
Subject: [PATCH] mbuf: dump outer VLAN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ]

Enable printing of the outer VLAN if flags indicate it is present.

Signed-off-by: Ben Magistro <koncept1 at gmail.com>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_mbuf/rte_mbuf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 5f77840557..6d3eb73ced 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -680,6 +680,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
 	fprintf(f, "  pkt_len=%u, ol_flags=%#"PRIx64", nb_segs=%u, port=%u",
 		m->pkt_len, m->ol_flags, m->nb_segs, m->port);
 
+	if (m->ol_flags & (PKT_RX_QINQ | PKT_TX_QINQ))
+		fprintf(f, ", vlan_tci_outer=%u", m->vlan_tci_outer);
+
 	if (m->ol_flags & (PKT_RX_VLAN | PKT_TX_VLAN))
 		fprintf(f, ", vlan_tci=%u", m->vlan_tci);
 
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:52.035162666 +0800
+++ 0060-mbuf-dump-outer-VLAN.patch	2022-06-21 15:37:49.081118072 +0800
@@ -1 +1 @@
-From 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d Mon Sep 17 00:00:00 2001
+From de28f76399f2f683a8802305c2250cf862979f70 Mon Sep 17 00:00:00 2001
@@ -7,0 +8 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
@@ -9 +10 @@
-Enable printing of the outer VLAN if flags indicate it is present.
+[ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ]
@@ -11 +12 @@
-Cc: stable at dpdk.org
+Enable printing of the outer VLAN if flags indicate it is present.
@@ -17 +18 @@
- lib/mbuf/rte_mbuf.c | 3 +++
+ lib/librte_mbuf/rte_mbuf.c | 3 +++
@@ -20,5 +21,5 @@
-diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
-index 87592faccb..a2307cebe6 100644
---- a/lib/mbuf/rte_mbuf.c
-+++ b/lib/mbuf/rte_mbuf.c
-@@ -674,6 +674,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
+diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
+index 5f77840557..6d3eb73ced 100644
+--- a/lib/librte_mbuf/rte_mbuf.c
++++ b/lib/librte_mbuf/rte_mbuf.c
+@@ -680,6 +680,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
@@ -28 +29 @@
-+	if (m->ol_flags & (RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_TX_QINQ))
++	if (m->ol_flags & (PKT_RX_QINQ | PKT_TX_QINQ))
@@ -31 +32 @@
- 	if (m->ol_flags & (RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_TX_VLAN))
+ 	if (m->ol_flags & (PKT_RX_VLAN | PKT_TX_VLAN))