network: drop carrier check for unmanaged interface from link_is_ready_to_configure()

Preparation for later commits. No functional change.

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7a5bc62415550254d284c687e27402b1fa1b105e..8d4e64769b3a3bae57a4f852faae621d4e80015b 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -98,12 +98,8 @@ bool link_is_ready_to_configure(Link *link, bool allow_unmanaged) {
         if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED, LINK_STATE_UNMANAGED))
                 return false;
 
-        if (!link->network) {
-                if (!allow_unmanaged)
-                        return false;
-
-                return link_has_carrier(link);
-        }
+        if (!link->network)
+                return allow_unmanaged;
 
         if (!link->network->configure_without_carrier) {
                 if (link->set_flags_messages > 0)

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 921b031b2963c3507412e020a5f72a44ca5578ce..71e578d89820f5c40e658c5966b30cb75832b939 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1298,7 +1298,8 @@ static int route_is_ready_to_configure(const Route *route, Link *link) {
                 if (r < 0)
                         return false;
                 if (r > 0) {
-                        if (!link_is_ready_to_configure(l, true))
+                        if (!link_is_ready_to_configure(l, /* allow_unmanaged = */ true) ||
+                            !link_has_carrier(l))
                                 return false;
 
                         m->ifindex = l->ifindex;