From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 22 Jan 2020 07:06:50 +0000 (+0900)
Subject: network: do nothing if link is in pending or linger state on reconfiguring
X-Git-Tag: v245-rc1~69^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14611%2Fhead;p=thirdparty%2Fsystemd.git

network: do nothing if link is in pending or linger state on reconfiguring
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 85d0c92b96d..f3744e2354c 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -3023,9 +3023,6 @@ static int link_reconfigure_internal(Link *link, sd_netlink_message *m, bool for
         Network *network;
         int r;
 
-        if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_LINGER))
-                return 0;
-
         if (m) {
                 _cleanup_strv_free_ char **s = NULL;
 
@@ -3128,6 +3125,9 @@ int link_reconfigure(Link *link, bool force) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
+        if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_LINGER))
+                return 0;
+
         r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK,
                                      link->ifindex);
         if (r < 0)