From 4a31c768a9f4e1ff957880a5c4f52d36d768e4a4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 2 Sep 2024 13:20:59 +0900 Subject: [PATCH] network/qdisc: make qdisc_drop() static This also drops unused constant return value. --- src/network/tc/qdisc.c | 4 +--- src/network/tc/qdisc.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 1475b4aced..851f624c45 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -392,7 +392,7 @@ void link_qdisc_drop_marked(Link *link) { } } -QDisc* qdisc_drop(QDisc *qdisc) { +static void qdisc_drop(QDisc *qdisc) { assert(qdisc); assert(qdisc->link); @@ -401,8 +401,6 @@ QDisc* qdisc_drop(QDisc *qdisc) { /* link_qdisc_drop_marked() may invalidate qdisc, so run link_tclass_drop_marked() first. */ link_tclass_drop_marked(qdisc->link); link_qdisc_drop_marked(qdisc->link); - - return NULL; } static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, QDisc *qdisc) { diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h index 3989ad7651..75351fb8ad 100644 --- a/src/network/tc/qdisc.h +++ b/src/network/tc/qdisc.h @@ -81,7 +81,6 @@ QDisc* qdisc_unref(QDisc *qdisc); int qdisc_new_static(QDiscKind kind, Network *network, const char *filename, unsigned section_line, QDisc **ret); void qdisc_mark_recursive(QDisc *qdisc); -QDisc* qdisc_drop(QDisc *qdisc); void link_qdisc_drop_marked(Link *link); int link_find_qdisc(Link *link, uint32_t handle, const char *kind, QDisc **qdisc); -- 2.25.1