]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: tc: drop unnecessary conditions
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 25 Jan 2022 21:42:23 +0000 (06:42 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 9 Feb 2022 05:35:25 +0000 (14:35 +0900)
As TC_H_UNSPEC is 0.

src/network/tc/qdisc.c
src/network/tc/tclass.c

index 7b41730fd17217f211fe58acd3a540a471c47c0f..c7a7bad168654f0bf8a7aa158a4af0d011840cb7 100644 (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")) {
index 6a36ac1c1cd6c1d8ce3a92e5e46f1f72a9f1e106..4e1386b48ff9893031b345adbfbb4530e7ca4ca8 100644 (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)