]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network/radv: drop unnecessary conditions 32413/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 20 Apr 2024 05:36:55 +0000 (14:36 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 22 Apr 2024 17:06:33 +0000 (02:06 +0900)
sd_radv_set_xyz() will handle invalid values gracefully.

src/network/networkd-radv.c

index 9ca20e1d51bf814a9190c702aa8471574c5006fd..485178678c9dfa8a063313edfbb38e21149ee3ac 100644 (file)
@@ -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);