From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 20 Apr 2024 05:36:55 +0000 (+0900)
Subject: network/radv: drop unnecessary conditions
X-Git-Tag: v256-rc1~54^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F32413%2Fhead;p=thirdparty%2Fsystemd.git

network/radv: drop unnecessary conditions

sd_radv_set_xyz() will handle invalid values gracefully.
---

diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 9ca20e1d51b..485178678c9 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -542,21 +542,17 @@ static int radv_configure(Link *link) {
         if (r < 0)
                 return r;
 
-        if (link->network->router_lifetime_usec > 0) {
-                r = sd_radv_set_preference(link->radv, link->network->router_preference);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_radv_set_preference(link->radv, link->network->router_preference);
+        if (r < 0)
+                return r;
 
         r = sd_radv_set_reachable_time(link->radv, link->network->router_reachable_usec);
         if (r < 0)
                 return r;
 
-        if (link->network->router_retransmit_usec > 0) {
-                r = sd_radv_set_retransmit(link->radv, link->network->router_retransmit_usec);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_radv_set_retransmit(link->radv, link->network->router_retransmit_usec);
+        if (r < 0)
+                return r;
 
         HASHMAP_FOREACH(p, link->network->prefixes_by_section) {
                 r = radv_set_prefix(link, p);