From 5f58af25e6c3b449b6b6657d413f98002bc3f0b7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 22 Jul 2020 06:07:42 +0900 Subject: [PATCH] network: make link_check_ready() return earlier if the link is not in 'configuring' state --- src/network/networkd-link.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index dd98bf2685..15cfe39553 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1086,8 +1086,11 @@ void link_check_ready(Link *link) { assert(link); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - log_link_debug(link, "%s(): link is in failed or linger state.", __func__); + if (link->state == LINK_STATE_CONFIGURED) + return; + + if (link->state != LINK_STATE_CONFIGURING) { + log_link_debug(link, "%s(): link is in %s state.", __func__, link_state_to_string(link->state)); return; } @@ -1189,8 +1192,7 @@ void link_check_ready(Link *link) { } } - if (link->state != LINK_STATE_CONFIGURED) - link_enter_configured(link); + link_enter_configured(link); return; } -- 2.25.1