patch 'doc: fix description of L2TPV2 flow item' has been queued to stable release 21.11.4
Kevin Traynor
ktraynor at redhat.com
Thu Feb 23 16:05:41 CET 2023
Hi,
FYI, your patch has been queued to stable release 21.11.4
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/28/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://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/8746dd7d44b2795f5019e37fb6899305b11d1cdb
Thanks.
Kevin
---
>From 8746dd7d44b2795f5019e37fb6899305b11d1cdb 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
[ 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 714769d0e4..7984e889c4 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1611,20 +1611,13 @@ rte_flow_flex_item_create() routine.
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.39.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-23 14:46:25.018858156 +0000
+++ 0050-doc-fix-description-of-L2TPV2-flow-item.patch 2023-02-23 14:46:23.775235983 +0000
@@ -1 +1 @@
-From a7d0dd8693417fbecb0debe7b4aec96dbafed51a Mon Sep 17 00:00:00 2001
+From 8746dd7d44b2795f5019e37fb6899305b11d1cdb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a7d0dd8693417fbecb0debe7b4aec96dbafed51a ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 59dfec1139..e465662da3 100644
+index 714769d0e4..7984e889c4 100644
@@ -26 +27 @@
-@@ -1499,20 +1499,13 @@ rte_flow_flex_item_create() routine.
+@@ -1611,20 +1611,13 @@ rte_flow_flex_item_create() routine.
More information about the stable
mailing list