summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Traynor <ktraynor@redhat.com>2018-08-01 16:30:49 +0100
committerThomas Monjalon <thomas@monjalon.net>2018-08-06 01:15:11 +0200
commit3a787d5bf14645ead95f3b31b98e661b13dde04c (patch)
tree067e0b63ec6db11f4d4ebe3ad9a9cd1d59748e6b
parentaed1a766ed329e2865b92d8923cf84758220c975 (diff)
downloaddpdk-3a787d5bf14645ead95f3b31b98e661b13dde04c.zip
dpdk-3a787d5bf14645ead95f3b31b98e661b13dde04c.tar.gz
dpdk-3a787d5bf14645ead95f3b31b98e661b13dde04c.tar.xz
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 <ktraynor@redhat.com> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-rw-r--r--examples/qos_meter/Makefile1
-rw-r--r--examples/qos_meter/meson.build1
-rw-r--r--lib/librte_meter/rte_meter.c4
-rw-r--r--lib/librte_meter/rte_meter.h5
-rw-r--r--lib/librte_meter/rte_meter_version.map2
5 files changed, 5 insertions, 8 deletions
diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile
index 6da2407..46341b1 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 10cd4bc..ef7779f 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 59af5ef..473f69a 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 03d8056..58a0515 100644
--- a/lib/librte_meter/rte_meter.h
+++ b/lib/librte_meter/rte_meter.h
@@ -20,7 +20,6 @@ extern "C" {
***/
#include <stdint.h>
-#include <rte_compat.h>
/*
* 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 9215d4c..cb79f0c 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;