From: Dariusz Sosnowski <[email protected]> Version function symbols added in commit 556b2a33727a ("net/mlx5: add aliases for some promoted symbols"):
- rte_pmd_mlx5_driver_event_cb_register - rte_pmd_mlx5_driver_event_cb_unregister - rte_pmd_mlx5_enable_steering - rte_pmd_mlx5_disable_steering are not needed after ABI version bump. This patch removes versioned symbols. Signed-off-by: Dariusz Sosnowski <[email protected]> Acked-by: David Marchand <[email protected]> --- drivers/net/mlx5/meson.build | 2 -- drivers/net/mlx5/mlx5_driver_event.c | 22 ++++++---------------- drivers/net/mlx5/mlx5_flow.c | 18 ++++++------------ 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 0fa6322779..82a7dfe782 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -2,8 +2,6 @@ # Copyright 2018 6WIND S.A. # Copyright 2018 Mellanox Technologies, Ltd -use_function_versioning = true - if not (is_linux or is_windows) build = false reason = 'only supported on Linux and Windows' diff --git a/drivers/net/mlx5/mlx5_driver_event.c b/drivers/net/mlx5/mlx5_driver_event.c index 52e6ad7824..89e49331c8 100644 --- a/drivers/net/mlx5/mlx5_driver_event.c +++ b/drivers/net/mlx5/mlx5_driver_event.c @@ -236,8 +236,9 @@ notify_existing_devices(rte_pmd_mlx5_driver_event_callback_t cb, void *opaque) notify_existing_queues(port_id, cb, opaque); } -RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_driver_event_cb_register, - (rte_pmd_mlx5_driver_event_callback_t cb, void *opaque)) +RTE_EXPORT_SYMBOL(rte_pmd_mlx5_driver_event_cb_register) +int +rte_pmd_mlx5_driver_event_cb_register(rte_pmd_mlx5_driver_event_callback_t cb, void *opaque) { struct registered_cb *r; @@ -263,14 +264,9 @@ RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_driver_event_cb_register, return 0; } -RTE_VERSION_EXPERIMENTAL_SYMBOL(int, rte_pmd_mlx5_driver_event_cb_register, - (rte_pmd_mlx5_driver_event_callback_t cb, void *opaque)) -{ - return rte_pmd_mlx5_driver_event_cb_register(cb, opaque); -} - -RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_driver_event_cb_unregister, - (rte_pmd_mlx5_driver_event_callback_t cb)) +RTE_EXPORT_SYMBOL(rte_pmd_mlx5_driver_event_cb_unregister) +int +rte_pmd_mlx5_driver_event_cb_unregister(rte_pmd_mlx5_driver_event_callback_t cb) { struct registered_cb *r; bool found = false; @@ -293,12 +289,6 @@ RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_driver_event_cb_unregister, return 0; } -RTE_VERSION_EXPERIMENTAL_SYMBOL(int, rte_pmd_mlx5_driver_event_cb_unregister, - (rte_pmd_mlx5_driver_event_callback_t cb)) -{ - return rte_pmd_mlx5_driver_event_cb_unregister(cb); -} - RTE_FINI(rte_pmd_mlx5_driver_event_cb_cleanup) { struct registered_cb *r; diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index fb90caf178..b0eac185b5 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -12537,7 +12537,9 @@ flow_disable_steering_run_on_related(struct rte_eth_dev *dev, } } -RTE_DEFAULT_SYMBOL(27, void, rte_pmd_mlx5_disable_steering, (void)) +RTE_EXPORT_SYMBOL(rte_pmd_mlx5_disable_steering) +void +rte_pmd_mlx5_disable_steering(void) { uint16_t port_id; @@ -12561,12 +12563,9 @@ RTE_DEFAULT_SYMBOL(27, void, rte_pmd_mlx5_disable_steering, (void)) mlx5_steering_disabled = true; } -RTE_VERSION_EXPERIMENTAL_SYMBOL(void, rte_pmd_mlx5_disable_steering, (void)) -{ - rte_pmd_mlx5_disable_steering(); -} - -RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_enable_steering, (void)) +RTE_EXPORT_SYMBOL(rte_pmd_mlx5_enable_steering) +int +rte_pmd_mlx5_enable_steering(void) { uint16_t port_id; @@ -12583,11 +12582,6 @@ RTE_DEFAULT_SYMBOL(27, int, rte_pmd_mlx5_enable_steering, (void)) return 0; } -RTE_VERSION_EXPERIMENTAL_SYMBOL(int, rte_pmd_mlx5_enable_steering, (void)) -{ - return rte_pmd_mlx5_enable_steering(); -} - bool mlx5_vport_rx_metadata_passing_enabled(const struct mlx5_dev_ctx_shared *sh) { -- 2.55.0
