From 742c2f217f59444f8d3ce7478435828590a960ad Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 14 Oct 2021 02:57:10 +0900 Subject: [PATCH] network: dhcp6: shorten code a bit --- src/network/networkd-dhcp6.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 9638c7ea76c..ccd6b65f29a 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -548,12 +548,9 @@ static int dhcp6_pd_prefix_distribute( if (assign_preferred_subnet_id != link_has_preferred_subnet_id(link)) continue; - r = dhcp6_pd_get_assigned_prefix(link, pd_prefix, pd_prefix_len, &assigned_prefix); - if (r < 0) { - r = dhcp6_get_preferred_delegated_prefix(link, pd_prefix, pd_prefix_len, &assigned_prefix); - if (r < 0) - continue; - } + if (dhcp6_pd_get_assigned_prefix(link, pd_prefix, pd_prefix_len, &assigned_prefix) < 0 && + dhcp6_get_preferred_delegated_prefix(link, pd_prefix, pd_prefix_len, &assigned_prefix) < 0) + continue; (void) in6_addr_prefix_to_string(&assigned_prefix, 64, &buf); r = dhcp6_pd_assign_prefix(link, &assigned_prefix, lifetime_preferred, lifetime_valid); -- 2.47.3