From 3a787d5bf14645ead95f3b31b98e661b13dde04c Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Wed, 1 Aug 2018 16:30:49 +0100 Subject: [PATCH] meter: remove experimental tag from profile API As per guideline that new APIs must be experimental for at least one release, it is now possible to remove the experimental tag from: rte_meter_srtcm_profile_config() rte_meter_trtcm_profile_config() Signed-off-by: Kevin Traynor Acked-by: Cristian Dumitrescu --- examples/qos_meter/Makefile | 1 - examples/qos_meter/meson.build | 1 - lib/librte_meter/rte_meter.c | 4 ++-- lib/librte_meter/rte_meter.h | 5 ++--- lib/librte_meter/rte_meter_version.map | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 6da2407611..46341b1a73 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -50,7 +50,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/qos_meter/meson.build b/examples/qos_meter/meson.build index 10cd4bc79b..ef7779f2f1 100644 --- a/examples/qos_meter/meson.build +++ b/examples/qos_meter/meson.build @@ -7,7 +7,6 @@ # DPDK instance, use 'make' deps += 'meter' -allow_experimental_apis = true sources = files( 'main.c', 'rte_policer.c' ) diff --git a/lib/librte_meter/rte_meter.c b/lib/librte_meter/rte_meter.c index 59af5ef299..473f69aba3 100644 --- a/lib/librte_meter/rte_meter.c +++ b/lib/librte_meter/rte_meter.c @@ -30,7 +30,7 @@ rte_meter_get_tb_params(uint64_t hz, uint64_t rate, uint64_t *tb_period, uint64_ } } -int __rte_experimental +int rte_meter_srtcm_profile_config(struct rte_meter_srtcm_profile *p, struct rte_meter_srtcm_params *params) { @@ -68,7 +68,7 @@ rte_meter_srtcm_config(struct rte_meter_srtcm *m, return 0; } -int __rte_experimental +int rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params) { diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h index 03d80566db..58a051583d 100644 --- a/lib/librte_meter/rte_meter.h +++ b/lib/librte_meter/rte_meter.h @@ -20,7 +20,6 @@ extern "C" { ***/ #include -#include /* * Application Programmer's Interface (API) @@ -82,7 +81,7 @@ struct rte_meter_trtcm; * @return * 0 upon success, error code otherwise */ -int __rte_experimental +int rte_meter_srtcm_profile_config(struct rte_meter_srtcm_profile *p, struct rte_meter_srtcm_params *params); @@ -96,7 +95,7 @@ rte_meter_srtcm_profile_config(struct rte_meter_srtcm_profile *p, * @return * 0 upon success, error code otherwise */ -int __rte_experimental +int rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params); diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map index 9215d4cbed..cb79f0c2b1 100644 --- a/lib/librte_meter/rte_meter_version.map +++ b/lib/librte_meter/rte_meter_version.map @@ -11,7 +11,7 @@ DPDK_2.0 { local: *; }; -EXPERIMENTAL { +DPDK_18.08 { global: rte_meter_srtcm_profile_config; -- 2.20.1