From 55c6f705bada3ab2b0d81b1bdc74253436d57ebc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 26 Jan 2022 06:42:23 +0900 Subject: [PATCH] network: tc: drop unnecessary conditions As TC_H_UNSPEC is 0. --- src/network/tc/qdisc.c | 14 +++++--------- src/network/tc/tclass.c | 8 +++----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 7b41730fd17..c7a7bad1686 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -187,11 +187,9 @@ int qdisc_configure(Link *link, QDisc *qdisc) { if (r < 0) return r; - if (qdisc->handle != TC_H_UNSPEC) { - r = sd_rtnl_message_set_qdisc_handle(req, qdisc->handle); - if (r < 0) - return r; - } + r = sd_rtnl_message_set_qdisc_handle(req, qdisc->handle); + if (r < 0) + return r; if (QDISC_VTABLE(qdisc)) { if (QDISC_VTABLE(qdisc)->fill_tca_kind) { @@ -290,11 +288,9 @@ int config_parse_qdisc_parent( return 0; } - if (streq(rvalue, "root")) { + if (streq(rvalue, "root")) qdisc->parent = TC_H_ROOT; - if (qdisc->handle == 0) - qdisc->handle = TC_H_UNSPEC; - } else if (streq(rvalue, "clsact")) { + else if (streq(rvalue, "clsact")) { qdisc->parent = TC_H_CLSACT; qdisc->handle = TC_H_MAKE(TC_H_CLSACT, 0); } else if (streq(rvalue, "ingress")) { diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c index 6a36ac1c1cd..4e1386b48ff 100644 --- a/src/network/tc/tclass.c +++ b/src/network/tc/tclass.c @@ -145,11 +145,9 @@ int tclass_configure(Link *link, TClass *tclass) { if (r < 0) return r; - if (tclass->classid != TC_H_UNSPEC) { - r = sd_rtnl_message_set_tclass_handle(req, tclass->classid); - if (r < 0) - return r; - } + r = sd_rtnl_message_set_tclass_handle(req, tclass->classid); + if (r < 0) + return r; r = sd_netlink_message_append_string(req, TCA_KIND, TCLASS_VTABLE(tclass)->tca_kind); if (r < 0) -- 2.47.3