[dpdk-stable] patch 'doc: clarify VLAN and QinQ Tx offload prerequisite' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 5a2b18e804d189922ce9b14a313fa735e24f3c34 Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerin.jacob at caviumnetworks.com>
Date: Tue, 16 Oct 2018 13:16:43 +0000
Subject: [PATCH] doc: clarify VLAN and QinQ Tx offload prerequisite

[ upstream commit 13ffe6059e36a54ee9285f7061d923b47d8ba79f ]

- Fix missing PKT_TX_VLAN mbuf.ol_flag and mbuf.vlan_tci
fields for Tx VLAN INSERT offload.

- Fix missing mbuf.vlan_tci_outer field for Tx QINQ INSERT offload.

- Rename deprecated PKT_TX_QINQ_PKT to PKT_TX_QINQ

Fixes: cba7f53b717d ("ethdev: introduce Tx queue offloads API")

Signed-off-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
---
 doc/guides/nics/features.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index a3b64c68c..bccc27f49 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -527,4 +527,5 @@ Supports VLAN offload to hardware.
 * **[uses]       rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_VLAN_STRIP,DEV_RX_OFFLOAD_VLAN_FILTER,DEV_RX_OFFLOAD_VLAN_EXTEND``.
 * **[uses]       rte_eth_txconf,rte_eth_txmode**: ``offloads:DEV_TX_OFFLOAD_VLAN_INSERT``.
+* **[uses]       mbuf**: ``mbuf.ol_flags:PKT_TX_VLAN``, ``mbuf.vlan_tci``.
 * **[implements] eth_dev_ops**: ``vlan_offload_set``.
 * **[provides]   mbuf**: ``mbuf.ol_flags:PKT_RX_VLAN_STRIPPED``, ``mbuf.vlan_tci``.
@@ -544,5 +545,5 @@ Supports QinQ (queue in queue) offload.
 * **[uses]     rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_QINQ_STRIP``.
 * **[uses]     rte_eth_txconf,rte_eth_txmode**: ``offloads:DEV_TX_OFFLOAD_QINQ_INSERT``.
-* **[uses]     mbuf**: ``mbuf.ol_flags:PKT_TX_QINQ_PKT``.
+* **[uses]     mbuf**: ``mbuf.ol_flags:PKT_TX_QINQ``, ``mbuf.vlan_tci_outer``.
 * **[provides] mbuf**: ``mbuf.ol_flags:PKT_RX_QINQ_STRIPPED``, ``mbuf.vlan_tci``,
    ``mbuf.vlan_tci_outer``.
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:32.662190620 +0000
+++ 0015-doc-clarify-VLAN-and-QinQ-Tx-offload-prerequisite.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,8 +1,10 @@
-From 13ffe6059e36a54ee9285f7061d923b47d8ba79f Mon Sep 17 00:00:00 2001
+From 5a2b18e804d189922ce9b14a313fa735e24f3c34 Mon Sep 17 00:00:00 2001
 From: Jerin Jacob <jerin.jacob at caviumnetworks.com>
 Date: Tue, 16 Oct 2018 13:16:43 +0000
 Subject: [PATCH] doc: clarify VLAN and QinQ Tx offload prerequisite
 
+[ upstream commit 13ffe6059e36a54ee9285f7061d923b47d8ba79f ]
+
 - Fix missing PKT_TX_VLAN mbuf.ol_flag and mbuf.vlan_tci
 fields for Tx VLAN INSERT offload.
 
@@ -11,7 +13,6 @@
 - Rename deprecated PKT_TX_QINQ_PKT to PKT_TX_QINQ
 
 Fixes: cba7f53b717d ("ethdev: introduce Tx queue offloads API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
 ---
@@ -19,22 +20,22 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
-index a9604c1e1..3fa5cb745 100644
+index a3b64c68c..bccc27f49 100644
 --- a/doc/guides/nics/features.rst
 +++ b/doc/guides/nics/features.rst
-@@ -528,4 +528,5 @@ Supports VLAN offload to hardware.
+@@ -527,4 +527,5 @@ Supports VLAN offload to hardware.
  * **[uses]       rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_VLAN_STRIP,DEV_RX_OFFLOAD_VLAN_FILTER,DEV_RX_OFFLOAD_VLAN_EXTEND``.
  * **[uses]       rte_eth_txconf,rte_eth_txmode**: ``offloads:DEV_TX_OFFLOAD_VLAN_INSERT``.
 +* **[uses]       mbuf**: ``mbuf.ol_flags:PKT_TX_VLAN``, ``mbuf.vlan_tci``.
  * **[implements] eth_dev_ops**: ``vlan_offload_set``.
- * **[provides]   mbuf**: ``mbuf.ol_flags:PKT_RX_VLAN_STRIPPED``, ``mbuf.ol_flags:PKT_RX_VLAN`` ``mbuf.vlan_tci``.
-@@ -545,5 +546,5 @@ Supports QinQ (queue in queue) offload.
+ * **[provides]   mbuf**: ``mbuf.ol_flags:PKT_RX_VLAN_STRIPPED``, ``mbuf.vlan_tci``.
+@@ -544,5 +545,5 @@ Supports QinQ (queue in queue) offload.
  * **[uses]     rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_QINQ_STRIP``.
  * **[uses]     rte_eth_txconf,rte_eth_txmode**: ``offloads:DEV_TX_OFFLOAD_QINQ_INSERT``.
 -* **[uses]     mbuf**: ``mbuf.ol_flags:PKT_TX_QINQ_PKT``.
 +* **[uses]     mbuf**: ``mbuf.ol_flags:PKT_TX_QINQ``, ``mbuf.vlan_tci_outer``.
- * **[provides] mbuf**: ``mbuf.ol_flags:PKT_RX_QINQ_STRIPPED``, ``mbuf.ol_flags:PKT_RX_QINQ``,
-   ``mbuf.ol_flags:PKT_RX_VLAN_STRIPPED``, ``mbuf.ol_flags:PKT_RX_VLAN``
+ * **[provides] mbuf**: ``mbuf.ol_flags:PKT_RX_QINQ_STRIPPED``, ``mbuf.vlan_tci``,
+    ``mbuf.vlan_tci_outer``.
 -- 
 2.19.0