From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 26 Feb 2022 02:36:45 +0000 (+0900)
Subject: network: traffic control: drop detailed log messages
X-Git-Tag: v251-rc1~218^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22625%2Fhead;p=thirdparty%2Fsystemd.git

network: traffic control: drop detailed log messages

This also renames `req` -> `m`.

Follow-up for a79a8d16d5b5f8709361d8deb42fc84ff2fe9c30 and #22014.
---

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index d69d8b48e99..7b2dacbd5ca 100644
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -320,7 +320,7 @@ static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
 }
 
 static int qdisc_configure(QDisc *qdisc, Link *link) {
-        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
         assert(qdisc);
@@ -331,24 +331,24 @@ static int qdisc_configure(QDisc *qdisc, Link *link) {
 
         log_qdisc_debug(qdisc, link, "Configuring");
 
-        r = sd_rtnl_message_new_traffic_control(link->manager->rtnl, &req, RTM_NEWQDISC,
+        r = sd_rtnl_message_new_traffic_control(link->manager->rtnl, &m, RTM_NEWQDISC,
                                                 link->ifindex, qdisc->handle, qdisc->parent);
         if (r < 0)
-                return log_link_debug_errno(link, r, "Could not create RTM_NEWQDISC message: %m");
+                return r;
 
-        r = sd_netlink_message_append_string(req, TCA_KIND, qdisc_get_tca_kind(qdisc));
+        r = sd_netlink_message_append_string(m, TCA_KIND, qdisc_get_tca_kind(qdisc));
         if (r < 0)
                 return r;
 
         if (QDISC_VTABLE(qdisc) && QDISC_VTABLE(qdisc)->fill_message) {
-                r = QDISC_VTABLE(qdisc)->fill_message(link, qdisc, req);
+                r = QDISC_VTABLE(qdisc)->fill_message(link, qdisc, m);
                 if (r < 0)
                         return r;
         }
 
-        r = netlink_call_async(link->manager->rtnl, NULL, req, qdisc_handler, link_netlink_destroy_callback, link);
+        r = netlink_call_async(link->manager->rtnl, NULL, m, qdisc_handler, link_netlink_destroy_callback, link);
         if (r < 0)
-                return log_link_debug_errno(link, r, "Could not send netlink message: %m");
+                return r;
 
         link_ref(link);
         return 0;
diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c
index 74df5528f30..e01e151d8f2 100644
--- a/src/network/tc/tclass.c
+++ b/src/network/tc/tclass.c
@@ -282,7 +282,7 @@ static int tclass_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
 }
 
 static int tclass_configure(TClass *tclass, Link *link) {
-        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
         assert(tclass);
@@ -293,24 +293,24 @@ static int tclass_configure(TClass *tclass, Link *link) {
 
         log_tclass_debug(tclass, link, "Configuring");
 
-        r = sd_rtnl_message_new_traffic_control(link->manager->rtnl, &req, RTM_NEWTCLASS,
+        r = sd_rtnl_message_new_traffic_control(link->manager->rtnl, &m, RTM_NEWTCLASS,
                                                 link->ifindex, tclass->classid, tclass->parent);
         if (r < 0)
-                return log_link_debug_errno(link, r, "Could not create RTM_NEWTCLASS message: %m");
+                return r;
 
-        r = sd_netlink_message_append_string(req, TCA_KIND, TCLASS_VTABLE(tclass)->tca_kind);
+        r = sd_netlink_message_append_string(m, TCA_KIND, TCLASS_VTABLE(tclass)->tca_kind);
         if (r < 0)
                 return r;
 
         if (TCLASS_VTABLE(tclass)->fill_message) {
-                r = TCLASS_VTABLE(tclass)->fill_message(link, tclass, req);
+                r = TCLASS_VTABLE(tclass)->fill_message(link, tclass, m);
                 if (r < 0)
                         return r;
         }
 
-        r = netlink_call_async(link->manager->rtnl, NULL, req, tclass_handler, link_netlink_destroy_callback, link);
+        r = netlink_call_async(link->manager->rtnl, NULL, m, tclass_handler, link_netlink_destroy_callback, link);
         if (r < 0)
-                return log_link_debug_errno(link, r, "Could not send netlink message: %m");
+                return r;
 
         link_ref(link);
         return 0;