src/network/networkd-link-bus.c

@@ -667,12 +667,11 @@ int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_
         r = link_reconfigure(l, true);
         if (r < 0)
                 return r;
-        if (r > 0) {
+
         link_set_state(l, LINK_STATE_INITIALIZED);
         r = link_save_and_clean(l);
         if (r < 0)
                 return r;
-        }
 
         return sd_bus_reply_method_return(message, NULL);
 }

src/network/networkd-link.c

@@ -2118,11 +2118,11 @@ static int link_configure_continue(Link *link) {
 }
 
 static int link_reconfigure_internal(Link *link, sd_netlink_message *m, bool force) {
-        _cleanup_strv_free_ char **s = NULL;
         Network *network;
         int r;
 
-        assert(m);
+        if (m) {
+                _cleanup_strv_free_ char **s = NULL;
 
                 r = sd_netlink_message_get_errno(m);
                 if (r < 0)
@@ -2133,6 +2133,7 @@ static int link_reconfigure_internal(Link *link, sd_netlink_message *m, bool for
                         return r;
 
                 strv_free_and_replace(link->alternative_names, s);
+        }
 
         r = network_get(link->manager, link->iftype, link->sd_device,
                         link->ifname, link->alternative_names, link->driver,
@@ -2222,11 +2223,8 @@ int link_reconfigure(Link *link, bool force) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
-        /* When link in pending or initialized state, then link_configure() will be called. To prevent
+        if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_LINGER))
-         * the function from being called multiple times simultaneously, refuse to reconfigure the
+                return 0;
-         * interface in these cases. */
-        if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_INITIALIZED, LINK_STATE_LINGER))
-                return 0; /* 0 means no-op. */
 
         r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK,
                                      link->ifindex);
@@ -2241,7 +2239,7 @@ int link_reconfigure(Link *link, bool force) {
 
         link_ref(link);
 
-        return 1; /* 1 means the interface will be reconfigured. */
+        return 0;
 }
 
 static int link_initialized_and_synced(Link *link) {
@@ -2478,7 +2476,7 @@ static int link_carrier_gained(Link *link) {
         if (r < 0)
                 return r;
         if (r > 0) {
-                r = link_reconfigure(link, false);
+                r = link_reconfigure_internal(link, NULL, false);
                 if (r < 0) {
                         link_enter_failed(link);
                         return r;