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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 06/13/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/1fae8c76b75781382f55648ac7b156e7b35a6224

Thanks.

Kevin

---
>From 1fae8c76b75781382f55648ac7b156e7b35a6224 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

[ 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/mbuf/rte_mbuf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 604d77bbda..dce900f28f 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -686,4 +686,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
 		m->pkt_len, m->ol_flags, m->nb_segs, m->port);
 
+	if (m->ol_flags & (RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_TX_QINQ))
+		fprintf(f, ", vlan_tci_outer=%u", m->vlan_tci_outer);
+
 	if (m->ol_flags & (RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_TX_VLAN))
 		fprintf(f, ", vlan_tci=%u", m->vlan_tci);
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-09 12:34:29.952945865 +0100
+++ 0007-mbuf-dump-outer-VLAN.patch	2022-06-09 12:34:29.613980415 +0100
@@ -1 +1 @@
-From 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d Mon Sep 17 00:00:00 2001
+From 1fae8c76b75781382f55648ac7b156e7b35a6224 Mon Sep 17 00:00:00 2001
@@ -9 +9 @@
-Enable printing of the outer VLAN if flags indicate it is present.
+[ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ]
@@ -11 +11 @@
-Cc: stable at dpdk.org
+Enable printing of the outer VLAN if flags indicate it is present.
@@ -21 +21 @@
-index 87592faccb..a2307cebe6 100644
+index 604d77bbda..dce900f28f 100644
@@ -24 +24 @@
-@@ -675,4 +675,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
+@@ -686,4 +686,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)