From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 7 Feb 2024 21:11:23 +0000 (+0900)
Subject: network/ndisc: sd_ndisc_router_get_{icmp6_ratelimit,retransmission_time}() should... 
X-Git-Tag: v256-rc1~942^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F31245%2Fhead;p=thirdparty%2Fsystemd.git

network/ndisc: sd_ndisc_router_get_{icmp6_ratelimit,retransmission_time}() should never fail

This also fixes use of '%m' specifier without passign error code.
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 13b09e99789..50ee3762231 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -372,10 +372,8 @@ static int ndisc_router_process_icmp6_ratelimit(Link *link, sd_ndisc_router *rt)
                 return 0;
 
         r = sd_ndisc_router_get_icmp6_ratelimit(rt, &icmp6_ratelimit);
-        if (r < 0) {
-                log_link_debug(link, "Failed to get ICMP6 ratelimit from RA, ignoring: %m");
-                return 0;
-        }
+        if (r < 0)
+                return log_link_warning_errno(link, r, "Failed to get ICMP6 ratelimit from RA: %m");
 
         /* We do not allow 0 here. */
         if (!timestamp_is_set(icmp6_ratelimit))
@@ -406,10 +404,8 @@ static int ndisc_router_process_retransmission_time(Link *link, sd_ndisc_router
                 return 0;
 
         r = sd_ndisc_router_get_retransmission_time(rt, &retrans_time);
-        if (r < 0) {
-                log_link_debug_errno(link, r, "Failed to get retransmission time from RA, ignoring: %m");
-                return 0;
-        }
+        if (r < 0)
+                return log_link_warning_errno(link, r, "Failed to get retransmission time from RA: %m");
 
         /* 0 is the unspecified value and must not be set (see RFC4861, 6.3.4) */
         if (!timestamp_is_set(retrans_time))