From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Nov 2023 17:28:56 +0000 (+0900)
Subject: network/dhcp6: use link_check_address_ready() at one more place
X-Git-Tag: v255-rc2~50^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e1781a9eaaca3a7249e8145ecb02ed25128c86;p=thirdparty%2Fsystemd.git

network/dhcp6: use link_check_address_ready() at one more place
---

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index cc2c466cdd0..6d38840ccb5 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -96,8 +96,6 @@ static int dhcp6_address_ready_callback(Address *address) {
 }
 
 int dhcp6_check_ready(Link *link) {
-        bool has_ready = false;
-        Address *address;
         int r;
 
         assert(link);
@@ -107,16 +105,9 @@ int dhcp6_check_ready(Link *link) {
                 return 0;
         }
 
-        SET_FOREACH(address, link->addresses) {
-                if (address->source != NETWORK_CONFIG_SOURCE_DHCP6)
-                        continue;
-                if (address_is_ready(address)) {
-                        has_ready = true;
-                        break;
-                }
-        }
+        if (!link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6)) {
+                Address *address;
 
-        if (!has_ready) {
                 SET_FOREACH(address, link->addresses)
                         if (address->source == NETWORK_CONFIG_SOURCE_DHCP6)
                                 address->callback = dhcp6_address_ready_callback;