From patchwork Mon Aug 17 10:22:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 75575 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C6F57A0351; Mon, 17 Aug 2020 12:22:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 39FD71C116; Mon, 17 Aug 2020 12:22:21 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id BC7511C05C for ; Mon, 17 Aug 2020 12:22:18 +0200 (CEST) IronPort-SDR: SLwcvvzCimR90dCoLgIDanhnRuqwc6PROjUuDtwYe5kFzEgdbRuzXa3dCHNCKMmdM6rwE96J0I 4TGAfxF0sbsA== X-IronPort-AV: E=McAfee;i="6000,8403,9715"; a="154648649" X-IronPort-AV: E=Sophos;i="5.76,322,1592895600"; d="scan'208";a="154648649" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 03:22:17 -0700 IronPort-SDR: b8tpnblrrE1bQK8bZR4+JThGlwI3pWTSF14irlIZCMnn3eYcHgtX2fUG5hwEM+bKqMkrKoo5IE 6FzEACVAh6Kg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,322,1592895600"; d="scan'208";a="328573003" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by fmsmga002.fm.intel.com with ESMTP; 17 Aug 2020 03:22:16 -0700 From: Ferruh Yigit To: Cristian Dumitrescu , Ray Kinsella , Neil Horman Cc: dev@dpdk.org, Ferruh Yigit Date: Mon, 17 Aug 2020 11:22:13 +0100 Message-Id: <20200817102214.1540887-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200817101819.1532616-1-ferruh.yigit@intel.com> References: <20200817101819.1532616-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2] meter: remove experimental alias X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Cristian Dumitrescu Acked-by: Cristian Dumitrescu Acked-by: Ray Kinsella --- v2: * Update meson to remove 'use_function_versioning' flag --- lib/librte_meter/meson.build | 1 - lib/librte_meter/rte_meter.c | 73 ++------------------------ lib/librte_meter/rte_meter_version.map | 7 --- 3 files changed, 3 insertions(+), 78 deletions(-) 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 #include #include -#include #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; -};