From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 Dec 2020 05:22:35 +0000 (+0900)
Subject: network: do not assume address ready callback is always set to static addresses
X-Git-Tag: v248-rc1~531^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b788a429d19acda8acb1c4b543da1adc2e49f4a9;p=thirdparty%2Fsystemd.git

network: do not assume address ready callback is always set to static addresses
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 59357a6b1c9..82daa1135ea 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -956,16 +956,11 @@ static int address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
                  * will not be called automatically. So, call it here. */
                 a = set_first(link->static_addresses);
                 if (!a) {
-                        log_link_warning(link, "No static address is stored.");
-                        link_enter_failed(link);
+                        log_link_debug(link, "No static address is stored. Already removed?");
                         return 1;
                 }
-                if (!a->callback) {
-                        log_link_warning(link, "Address ready callback is not set.");
-                        link_enter_failed(link);
-                        return 1;
-                }
-                r = a->callback(a);
+
+                r = static_address_ready_callback(a);
                 if (r < 0)
                         link_enter_failed(link);
         }