From 5e906f483b2bb8ecdaa245110292dcb8216524da Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 11 Dec 2020 14:22:35 +0900 Subject: [PATCH] network: do not assume address ready callback is always set to static addresses (cherry picked from commit b788a429d19acda8acb1c4b543da1adc2e49f4a9) --- src/network/networkd-address.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 919303fe12..961b248385 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -962,16 +962,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); }