From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 21 Jul 2020 21:07:42 +0000 (+0900)
Subject: network: make link_check_ready() return earlier if the link is not in 'configuring... 
X-Git-Tag: v246~14^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f58af25e6c3b449b6b6657d413f98002bc3f0b7;p=thirdparty%2Fsystemd.git

network: make link_check_ready() return earlier if the link is not in 'configuring' state
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index dd98bf26856..15cfe395537 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;
 }