]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: assume enslaved when master ifindex is positive
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 2 Sep 2021 23:04:29 +0000 (08:04 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 3 Sep 2021 15:20:36 +0000 (00:20 +0900)
src/network/networkd-link.c

index b3aa5bd8074ddffe4c90019feea370361836370f..4afd540d201512f97c196341543bef40abc18f18 100644 (file)
@@ -1689,17 +1689,11 @@ bool link_has_carrier(Link *link) {
 
 static bool link_is_enslaved(Link *link) {
         if (link->flags & IFF_SLAVE)
-                /* Even if the link is not managed by networkd, honor IFF_SLAVE flag. */
                 return true;
 
-        if (!link->network)
-                return false;
-
-        if (link->master_ifindex > 0 && link->network->bridge)
+        if (link->master_ifindex > 0)
                 return true;
 
-        /* TODO: add conditions for other netdevs. */
-
         return false;
 }