From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 17 Aug 2020 10:22:13 +0000 (+0100)
Subject: meter: remove experimental alias
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=61e436e1f3c0a6b51397dfb0027c715ea454bd6f;p=dpdk.git

meter: remove experimental alias

Remove ABI versioning for APIs:
'rte_meter_trtcm_rfc4115_profile_config()'
'rte_meter_trtcm_rfc4115_config()'

The alias was introduced in
commit 60197bda97a0 ("meter: provide experimental alias for matured API")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
---

diff --git a/lib/librte_meter/meson.build b/lib/librte_meter/meson.build
index fce0368437..646fd4d43f 100644
--- a/lib/librte_meter/meson.build
+++ b/lib/librte_meter/meson.build
@@ -3,4 +3,3 @@
 
 sources = files('rte_meter.c')
 headers = files('rte_meter.h')
-use_function_versioning = true
diff --git a/lib/librte_meter/rte_meter.c b/lib/librte_meter/rte_meter.c
index 149cf58bdd..da01429a8b 100644
--- a/lib/librte_meter/rte_meter.c
+++ b/lib/librte_meter/rte_meter.c
@@ -9,7 +9,6 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_cycles.h>
-#include <rte_function_versioning.h>
 
 #include "rte_meter.h"
 
@@ -120,15 +119,8 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
 	return 0;
 }
 
-/*
- *  ABI aliasing done for 'rte_meter_trtcm_rfc4115_profile_config'
- *  to support both EXPERIMENTAL and DPDK_21 versions
- *  This versioning will be removed on next ABI version (v20.11)
- *  and '__rte_meter_trtcm_rfc4115_profile_config' will be restrored back to
- *  'rte_meter_trtcm_rfc4115_profile_config' without versioning.
- */
-static int
-__rte_meter_trtcm_rfc4115_profile_config(
+int
+rte_meter_trtcm_rfc4115_profile_config(
 	struct rte_meter_trtcm_rfc4115_profile *p,
 	struct rte_meter_trtcm_rfc4115_params *params)
 {
@@ -153,42 +145,7 @@ __rte_meter_trtcm_rfc4115_profile_config(
 }
 
 int
-rte_meter_trtcm_rfc4115_profile_config_s(
-	struct rte_meter_trtcm_rfc4115_profile *p,
-	struct rte_meter_trtcm_rfc4115_params *params);
-int
-rte_meter_trtcm_rfc4115_profile_config_s(
-	struct rte_meter_trtcm_rfc4115_profile *p,
-	struct rte_meter_trtcm_rfc4115_params *params)
-{
-	return __rte_meter_trtcm_rfc4115_profile_config(p, params);
-}
-BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_profile_config, _s, 21);
-MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_profile_config(struct rte_meter_trtcm_rfc4115_profile *p,
-		struct rte_meter_trtcm_rfc4115_params *params), rte_meter_trtcm_rfc4115_profile_config_s);
-
-int
-rte_meter_trtcm_rfc4115_profile_config_e(
-	struct rte_meter_trtcm_rfc4115_profile *p,
-	struct rte_meter_trtcm_rfc4115_params *params);
-int
-rte_meter_trtcm_rfc4115_profile_config_e(
-	struct rte_meter_trtcm_rfc4115_profile *p,
-	struct rte_meter_trtcm_rfc4115_params *params)
-{
-	return __rte_meter_trtcm_rfc4115_profile_config(p, params);
-}
-VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_profile_config, _e);
-
-/*
- *  ABI aliasing done for 'rte_meter_trtcm_rfc4115_config'
- *  to support both EXPERIMENTAL and DPDK_21 versions
- *  This versioning will be removed on next ABI version (v20.11)
- *  and '__rte_meter_trtcm_rfc4115_config' will be restrored back to
- *  'rte_meter_trtcm_rfc4115_config' without versioning.
- */
-static int
-__rte_meter_trtcm_rfc4115_config(
+rte_meter_trtcm_rfc4115_config(
 	struct rte_meter_trtcm_rfc4115 *m,
 	struct rte_meter_trtcm_rfc4115_profile *p)
 {
@@ -203,27 +160,3 @@ __rte_meter_trtcm_rfc4115_config(
 
 	return 0;
 }
-
-int
-rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
-	struct rte_meter_trtcm_rfc4115_profile *p);
-int
-rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
-	struct rte_meter_trtcm_rfc4115_profile *p)
-{
-	return __rte_meter_trtcm_rfc4115_config(m, p);
-}
-BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_config, _s, 21);
-MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_config(struct rte_meter_trtcm_rfc4115 *m,
-		 struct rte_meter_trtcm_rfc4115_profile *p), rte_meter_trtcm_rfc4115_config_s);
-
-int
-rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
-	struct rte_meter_trtcm_rfc4115_profile *p);
-int
-rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
-	struct rte_meter_trtcm_rfc4115_profile *p)
-{
-	return __rte_meter_trtcm_rfc4115_config(m, p);
-}
-VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_config, _e);
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index e2a2607f28..b67f860b15 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -10,10 +10,3 @@ DPDK_21 {
 
 	local: *;
 };
-
-EXPERIMENTAL {
-	global:
-
-	rte_meter_trtcm_rfc4115_config;
-	rte_meter_trtcm_rfc4115_profile_config;
-};