[dpdk-stable] patch 'doc: fix QinQ flow rules in testpmd guide' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/10/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/b6b428b9ea5d72974958ed607de878b9d05220ab

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From b6b428b9ea5d72974958ed607de878b9d05220ab Mon Sep 17 00:00:00 2001
From: Bernard Iremonger <bernard.iremonger at intel.com>
Date: Tue, 19 Jan 2021 13:00:52 +0000
Subject: [PATCH] doc: fix QinQ flow rules in testpmd guide

[ upstream commit 836cdce48822f31316849adc00086e17131908d7 ]

In the Testpmd Flow rules management section, correct
the TPID values in the Sample QinQ flow rules sub section.
Also replace the keyword qinq_strip with extend in the
vlan set command.

Fixes: bef3bfe7d5f4 ("doc: revise sample testpmd flow commands")

Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
Acked-by: Xiaoyun Li <xiaoyun.li at intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 4dd29ee929..17a41c21e5 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -4435,14 +4435,14 @@ Sample QinQ flow rules
 Before creating QinQ rule(s) the following commands should be issued to enable QinQ::
 
    testpmd> port stop 0
-   testpmd> vlan set qinq_strip on 0
+   testpmd> vlan set extend on 0
 
 The above command sets the inner and outer TPID's to 0x8100.
 
 To change the TPID's the following commands should be used::
 
-   testpmd> vlan set outer tpid 0xa100 0
-   testpmd> vlan set inner tpid 0x9100 0
+   testpmd> vlan set outer tpid 0x88A8 0
+   testpmd> vlan set inner tpid 0x8100 0
    testpmd> port start 0
 
 Validate and create a QinQ rule on port 0 to steer traffic to a VF queue in a VM.
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-08 12:04:29.673712753 +0100
+++ 0003-doc-fix-QinQ-flow-rules-in-testpmd-guide.patch	2021-02-08 12:04:29.527496792 +0100
@@ -1 +1 @@
-From 836cdce48822f31316849adc00086e17131908d7 Mon Sep 17 00:00:00 2001
+From b6b428b9ea5d72974958ed607de878b9d05220ab Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 836cdce48822f31316849adc00086e17131908d7 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 3ccc9fc300..a45910b81e 100644
+index 4dd29ee929..17a41c21e5 100644
@@ -24 +25 @@
-@@ -4434,14 +4434,14 @@ Sample QinQ flow rules
+@@ -4435,14 +4435,14 @@ Sample QinQ flow rules