]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: do not call link_joined() when not all netdevs are configured
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 11 Mar 2019 06:35:35 +0000 (15:35 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 14 Mar 2019 01:57:41 +0000 (10:57 +0900)
If some of stacked netdevs are already configured, then link_joined()
is called before netdevs are fully configured.

src/network/networkd-link.c

index 7983f448a106473986922dcb1d97b6747b1ea64e..42fcb500db890df6490586a9294b0761bae1cb11 100644 (file)
@@ -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),