From 3d7f26d9f2d2e1129dfd64f786ae04d75d546a61 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 2 Sep 2024 13:22:41 +0900 Subject: [PATCH] network/tclass: make tclass_drop() static This also drops unused constant return value. --- src/network/tc/tclass.c | 6 ++---- src/network/tc/tclass.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c index 926ec69adf0..3c74f95992c 100644 --- a/src/network/tc/tclass.c +++ b/src/network/tc/tclass.c @@ -359,7 +359,7 @@ void link_tclass_drop_marked(Link *link) { } } -TClass* tclass_drop(TClass *tclass) { +static void tclass_drop(TClass *tclass) { assert(tclass); tclass_mark_recursive(tclass); @@ -367,8 +367,6 @@ TClass* tclass_drop(TClass *tclass) { /* link_tclass_drop_marked() may invalidate tclass, so run link_qdisc_drop_marked() first. */ link_qdisc_drop_marked(tclass->link); link_tclass_drop_marked(tclass->link); - - return NULL; } static int tclass_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, TClass *tclass) { @@ -584,7 +582,7 @@ int manager_rtnl_process_tclass(sd_netlink *rtnl, sd_netlink_message *message, M case RTM_DELTCLASS: if (tclass) - (void) tclass_drop(tclass); + tclass_drop(tclass); else log_tclass_debug(tmp, link, "Kernel removed unknown"); diff --git a/src/network/tc/tclass.h b/src/network/tc/tclass.h index 44f71814501..ce51b2499ec 100644 --- a/src/network/tc/tclass.h +++ b/src/network/tc/tclass.h @@ -62,7 +62,6 @@ TClass* tclass_unref(TClass *tclass); int tclass_new_static(TClassKind kind, Network *network, const char *filename, unsigned section_line, TClass **ret); void tclass_mark_recursive(TClass *tclass); -TClass* tclass_drop(TClass *tclass); void link_tclass_drop_marked(Link *link); int link_find_tclass(Link *link, uint32_t classid, TClass **ret); -- 2.47.3