[dpdk-stable] patch 'ethdev: fix doc of flow action' has been queued to stable release 19.11.10

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Aug 10 17:39:14 CEST 2021


Hi,

FYI, your patch has been queued to stable release 19.11.10

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From cb835fac3fb4b300166daeba74941d60765e4a4d Mon Sep 17 00:00:00 2001
From: Jan Viktorin <viktorin at cesnet.cz>
Date: Wed, 23 Jun 2021 11:18:25 +0200
Subject: [PATCH] ethdev: fix doc of flow action

[ upstream commit 56912ddef2b067a402dc648019938d354237c25a ]

The struct rte_flow_action was missing from DPDK API documentation.

Fixes: 3850cf0c8c37 ("ethdev: add tunnel encap/decap actions")

Signed-off-by: Jan Viktorin <viktorin at cesnet.cz>
Acked-by: Ori Kam <orika at nvidia.com>
Acked-by: Aman Deep Singh <aman.deep.singh at intel.com>
---
 lib/librte_ethdev/rte_flow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index c32cd40434..12f69b6365 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -2558,7 +2558,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v)
 	*RTE_FLOW_DYNF_METADATA(m) = v;
 }
 
-/*
+/**
  * Definition of a single action.
  *
  * A list of actions is terminated by a END action.
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:14.379727658 +0200
+++ 0034-ethdev-fix-doc-of-flow-action.patch	2021-08-10 15:11:12.970637754 +0200
@@ -1 +1 @@
-From 56912ddef2b067a402dc648019938d354237c25a Mon Sep 17 00:00:00 2001
+From cb835fac3fb4b300166daeba74941d60765e4a4d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 56912ddef2b067a402dc648019938d354237c25a ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -15 +16 @@
- lib/ethdev/rte_flow.h | 2 +-
+ lib/librte_ethdev/rte_flow.h | 2 +-
@@ -18,5 +19,5 @@
-diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
-index 961a5884fe..70f455d47d 100644
---- a/lib/ethdev/rte_flow.h
-+++ b/lib/ethdev/rte_flow.h
-@@ -3278,7 +3278,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v)
+diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
+index c32cd40434..12f69b6365 100644
+--- a/lib/librte_ethdev/rte_flow.h
++++ b/lib/librte_ethdev/rte_flow.h
+@@ -2558,7 +2558,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v)


More information about the stable mailing list