Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / src / network / tc / sfq.c

diff --git a/src/network/tc/sfq.c b/src/network/tc/sfq.c
index ee66409b94abc2edab5c8ef74a1aeaf471e8338d..387be83a99698d896c5f1e9dfa638280edb5fb39 100644 (file)
--- a/src/network/tc/sfq.c
+++ b/src/network/tc/sfq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
@@ -56,9 +56,11 @@ int config_parse_stochastic_fairness_queueing_perturb_period(
         r = qdisc_new_static(QDISC_KIND_SFQ, network, filename, section_line, &qdisc);
         if (r == -ENOMEM)
                 return log_oom();
-        if (r < 0)
-                return log_syntax(unit, LOG_ERR, filename, line, r,
-                                  "More than one kind of queueing discipline, ignoring assignment: %m");
+        if (r < 0) {
+                log_syntax(unit, LOG_WARNING, filename, line, r,
+                           "More than one kind of queueing discipline, ignoring assignment: %m");
+                return 0;
+        }
 
         sfq = SFQ(qdisc);
 
@@ -71,7 +73,7 @@ int config_parse_stochastic_fairness_queueing_perturb_period(
 
         r = parse_sec(rvalue, &sfq->perturb_period);
         if (r < 0) {
-                log_syntax(unit, LOG_ERR, filename, line, r,
+                log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to parse '%s=', ignoring assignment: %s",
                            lvalue, rvalue);
                 return 0;