From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 11 Mar 2019 06:35:35 +0000 (+0900)
Subject: network: do not call link_joined() when not all netdevs are configured
X-Git-Tag: v242-rc1~137^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b6db913e2f7f4c203360ea8a2c2f19570b8aa2f;p=thirdparty%2Fsystemd.git

network: do not call link_joined() when not all netdevs are configured

If some of stacked netdevs are already configured, then link_joined()
is called before netdevs are fully configured.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7983f448a10..42fcb500db8 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2681,10 +2681,9 @@ static int link_enter_join_netdev(Link *link) {
 
         HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) {
 
-                if (netdev->ifindex > 0) {
-                        link_joined(link);
+                if (netdev->ifindex > 0)
+                        /* Assume already enslaved. */
                         continue;
-                }
 
                 log_struct(LOG_DEBUG,
                            LOG_LINK_INTERFACE(link),