shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-18 17:57:27 +03:00
Code

network: tc: drop unnecessary conditions

Browse Source 
As TC_H_UNSPEC is 0.
This commit is contained in:
Yu Watanabe 2022-01-26 06:42:23 +09:00
parent 058fd55efa
commit 55c6f705ba
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/tc/qdisc.c
View File

@ -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")) {

8
src/network/tc/tclass.c
View File

@ -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)