patch 'meter: fix RFC4115 trTCM API Doxygen' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Mon Dec 11 11:11:40 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.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 12/13/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=c38b8769022862bac2894c569beba15f078a4e88

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c38b8769022862bac2894c569beba15f078a4e88 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Mon, 23 Oct 2023 19:54:11 -0700
Subject: [PATCH] meter: fix RFC4115 trTCM API Doxygen
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d053bcdafd347a6735d47b1f0139e9c268f56972 ]

The API's for rte_meter_trtcm were documented as experimental
with warning in documentation but the API's were not marked
as experimental in version.map and/or with __rte_experimental.

This patch removes the warnings from the docbook comment.

Fixes: 30512af820fe ("meter: remove experimental flag from RFC4115 trTCM API")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 lib/meter/rte_meter.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/meter/rte_meter.h b/lib/meter/rte_meter.h
index 0932645d0a..35e2675028 100644
--- a/lib/meter/rte_meter.h
+++ b/lib/meter/rte_meter.h
@@ -127,9 +127,6 @@ int
 rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p,
 	struct rte_meter_trtcm_params *params);
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * trTCM RFC 4115 profile configuration
  *
  * @param p
@@ -173,9 +170,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
 	struct rte_meter_trtcm_profile *p);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * trTCM RFC 4115 configuration per metered traffic flow
  *
  * @param m
@@ -276,9 +270,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
 	enum rte_color pkt_color);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * trTCM RFC4115 color blind traffic metering
  *
  * @param m
@@ -300,9 +291,6 @@ rte_meter_trtcm_rfc4115_color_blind_check(
 	uint32_t pkt_len);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * trTCM RFC4115 color aware traffic metering
  *
  * @param m
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:25.510681100 +0800
+++ 0075-meter-fix-RFC4115-trTCM-API-Doxygen.patch	2023-12-11 17:56:23.087652300 +0800
@@ -1 +1 @@
-From d053bcdafd347a6735d47b1f0139e9c268f56972 Mon Sep 17 00:00:00 2001
+From c38b8769022862bac2894c569beba15f078a4e88 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d053bcdafd347a6735d47b1f0139e9c268f56972 ]
@@ -22 +25 @@
-index 6ba9967436..bd68cbe389 100644
+index 0932645d0a..35e2675028 100644
@@ -25 +28 @@
-@@ -124,9 +124,6 @@ int
+@@ -127,9 +127,6 @@ int
@@ -35 +38 @@
-@@ -170,9 +167,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
+@@ -173,9 +170,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
@@ -45 +48 @@
-@@ -273,9 +267,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
+@@ -276,9 +270,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
@@ -55 +58 @@
-@@ -297,9 +288,6 @@ rte_meter_trtcm_rfc4115_color_blind_check(
+@@ -300,9 +291,6 @@ rte_meter_trtcm_rfc4115_color_blind_check(


More information about the stable mailing list