patch 'doc: fix description of L2TPV2 flow item' has been queued to stable release 22.11.2

Xueming Li xuemingl at nvidia.com
Mon Feb 27 07:59:57 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.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 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=8eefe1d245d757bdea432ca52ef5d6e38dc8c079

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 8eefe1d245d757bdea432ca52ef5d6e38dc8c079 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 25 Oct 2022 23:44:09 +0200
Subject: [PATCH] doc: fix description of L2TPV2 flow item
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit a7d0dd8693417fbecb0debe7b4aec96dbafed51a ]

The flow item structure includes the protocol definition
from the directory lib/net/, so it is reflected in the guide.

Section title underlining is also fixed around.

Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
---
 doc/guides/prog_guide/rte_flow.rst | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index 3e6242803d..40d3f5bd44 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1513,22 +1513,15 @@ rte_flow_flex_item_create() routine.
   value and mask.

 Item: ``L2TPV2``
-^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^

 Matches a L2TPv2 header.

-- ``flags_version``: flags(12b), version(4b).
-- ``length``: total length of the message.
-- ``tunnel_id``: identifier for the control connection.
-- ``session_id``: identifier for a session within a tunnel.
-- ``ns``: sequence number for this date or control message.
-- ``nr``: sequence number expected in the next control message to be received.
-- ``offset_size``: offset of payload data.
-- ``offset_padding``: offset padding, variable length.
+- ``hdr``:  header definition (``rte_l2tpv2.h``).
 - Default ``mask`` matches flags_version only.

 Item: ``PPP``
-^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^

 Matches a PPP header.

--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:43.770334600 +0800
+++ 0090-doc-fix-description-of-L2TPV2-flow-item.patch	2023-02-27 14:08:40.819237000 +0800
@@ -1 +1 @@
-From a7d0dd8693417fbecb0debe7b4aec96dbafed51a Mon Sep 17 00:00:00 2001
+From 8eefe1d245d757bdea432ca52ef5d6e38dc8c079 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit a7d0dd8693417fbecb0debe7b4aec96dbafed51a ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 59dfec1139..e465662da3 100644
+index 3e6242803d..40d3f5bd44 100644
@@ -26 +28 @@
-@@ -1498,22 +1498,15 @@ rte_flow_flex_item_create() routine.
+@@ -1513,22 +1513,15 @@ rte_flow_flex_item_create() routine.


More information about the stable mailing list