]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: dhcp6: shorten code a bit 21037/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 13 Oct 2021 17:57:10 +0000 (02:57 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 18 Oct 2021 15:55:55 +0000 (00:55 +0900)
src/network/networkd-dhcp6.c

index 9638c7ea76c7016fa0a0e59579b6d49b5da6d523..ccd6b65f29aa500fc55011abc42e7e51265d707d 100644 (file)
@@ -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);