From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 12 Oct 2024 07:45:05 +0000 (+0900)
Subject: network/sysctl: make link_set_ipv6_mtu() log failures
X-Git-Tag: v257-rc1~225^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7edfbf4130ccdb517a127a3ad3748dfc82739b9e;p=thirdparty%2Fsystemd.git

network/sysctl: make link_set_ipv6_mtu() log failures

No functional change, just refactoring.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 234e08680bf..5469bee5516 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1869,8 +1869,6 @@ static int link_carrier_lost(Link *link) {
 }
 
 static int link_admin_state_up(Link *link) {
-        int r;
-
         assert(link);
 
         /* This is called every time an interface admin state changes to up;
@@ -1886,9 +1884,7 @@ static int link_admin_state_up(Link *link) {
 
         /* We set the ipv6 mtu after the device mtu, but the kernel resets
          * ipv6 mtu on NETDEV_UP, so we need to reset it. */
-        r = link_set_ipv6_mtu(link, LOG_INFO);
-        if (r < 0)
-                log_link_warning_errno(link, r, "Cannot set IPv6 MTU, ignoring: %m");
+        (void) link_set_ipv6_mtu(link, LOG_INFO);
 
         return 0;
 }
@@ -2439,12 +2435,9 @@ static int link_update_mtu(Link *link, sd_netlink_message *message) {
 
         link->mtu = mtu;
 
-        if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) {
+        if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
                 /* The kernel resets IPv6 MTU after changing device MTU. So, we need to re-set IPv6 MTU again. */
-                r = link_set_ipv6_mtu(link, LOG_INFO);
-                if (r < 0)
-                        log_link_warning_errno(link, r, "Failed to set IPv6 MTU, ignoring: %m");
-        }
+                (void) link_set_ipv6_mtu(link, LOG_INFO);
 
         if (link->dhcp_client) {
                 r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu);
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 529311f4a41..fc06e5c38ba 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1083,9 +1083,7 @@ static int ndisc_router_process_mtu(Link *link, sd_ndisc_router *rt) {
 
         link->ndisc_mtu = mtu;
 
-        r = link_set_ipv6_mtu(link, LOG_DEBUG);
-        if (r < 0)
-                log_link_warning_errno(link, r, "Failed to apply IPv6 MTU (%"PRIu32"), ignoring: %m", mtu);
+        (void) link_set_ipv6_mtu(link, LOG_DEBUG);
 
         return 0;
 }
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index 7330c2cc760..6caa7201fdd 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -503,6 +503,7 @@ static int link_set_ipv6_proxy_ndp(Link *link) {
 
 int link_set_ipv6_mtu(Link *link, int log_level) {
         uint32_t mtu = 0;
+        int r;
 
         assert(link);
         assert(link->manager);
@@ -526,7 +527,11 @@ int link_set_ipv6_mtu(Link *link, int log_level) {
                 mtu = link->mtu;
         }
 
-        return sysctl_write_ip_property_uint32(AF_INET6, link->ifname, "mtu", mtu, manager_get_sysctl_shadow(link->manager));
+        r = sysctl_write_ip_property_uint32(AF_INET6, link->ifname, "mtu", mtu, manager_get_sysctl_shadow(link->manager));
+        if (r < 0)
+                return log_link_warning_errno(link, r, "Failed to set IPv6 MTU to %"PRIu32": %m", mtu);
+
+        return 0;
 }
 
 static int link_set_ipv4_accept_local(Link *link) {
@@ -616,9 +621,7 @@ int link_set_sysctl(Link *link) {
         if (r < 0)
                 log_link_warning_errno(link, r, "Cannot set IPv6 proxy NDP, ignoring: %m");
 
-        r = link_set_ipv6_mtu(link, LOG_INFO);
-        if (r < 0)
-                log_link_warning_errno(link, r, "Cannot set IPv6 MTU, ignoring: %m");
+        (void) link_set_ipv6_mtu(link, LOG_INFO);
 
         r = link_set_ipv6ll_stable_secret(link);
         if (r < 0)