From a05381d58b9b67e684146b6f2d5122561666f39a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 20 Apr 2024 14:36:55 +0900 Subject: [PATCH] network/radv: drop unnecessary conditions sd_radv_set_xyz() will handle invalid values gracefully. --- src/network/networkd-radv.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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); -- 2.47.3