From 7eeb29bc536a8bca21703e4fab817daeeaa890df Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 18 Jan 2018 07:54:27 +0100 Subject: route: rename rtnl_cls_cache_set_tcm_params() and fix symbol versioning After rethinking, "tcm_params" doesn't seem like a good name. Change it to "tc_params". Also, an already released section in the linker file must never be modified. It defeats the purpose of symbol versioning. Move the symbol to the right section. --- include/netlink/route/classifier.h | 2 +- lib/route/cls.c | 4 ++-- libnl-route-3.sym | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/netlink/route/classifier.h b/include/netlink/route/classifier.h index 82a691f..18832ad 100644 --- a/include/netlink/route/classifier.h +++ b/include/netlink/route/classifier.h @@ -27,7 +27,7 @@ extern void rtnl_cls_put(struct rtnl_cls *); extern int rtnl_cls_alloc_cache(struct nl_sock *, int, uint32_t, struct nl_cache **); -extern void rtnl_cls_cache_set_tcm_params(struct nl_cache *, int, uint32_t); +extern void rtnl_cls_cache_set_tc_params(struct nl_cache *, int, uint32_t); extern int rtnl_cls_build_add_request(struct rtnl_cls *, int, struct nl_msg **); diff --git a/lib/route/cls.c b/lib/route/cls.c index 2aaabfc..27f43c7 100644 --- a/lib/route/cls.c +++ b/lib/route/cls.c @@ -356,8 +356,8 @@ int rtnl_cls_alloc_cache(struct nl_sock *sk, int ifindex, uint32_t parent, * * @return void. */ -void rtnl_cls_cache_set_tcm_params(struct nl_cache *cache, - int ifindex, uint32_t parent) +void rtnl_cls_cache_set_tc_params(struct nl_cache *cache, + int ifindex, uint32_t parent) { cache->c_iarg1 = ifindex; cache->c_iarg2 = parent; diff --git a/libnl-route-3.sym b/libnl-route-3.sym index 04ff11b..917aea7 100644 --- a/libnl-route-3.sym +++ b/libnl-route-3.sym @@ -151,7 +151,6 @@ global: rtnl_cls_add; rtnl_cls_alloc; rtnl_cls_alloc_cache; - rtnl_cls_cache_set_tcm_params; rtnl_cls_build_add_request; rtnl_cls_build_change_request; rtnl_cls_build_delete_request; @@ -1065,5 +1064,6 @@ global: libnl_3_5 { global: + rtnl_cls_cache_set_tc_params; rtnl_netem_set_delay_distribution_data; } libnl_3_4; -- cgit v0.12