From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 2 Sep 2021 23:04:29 +0000 (+0900)
Subject: network: assume enslaved when master ifindex is positive
X-Git-Tag: v250-rc1~730^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f024462d189277d53a18955ab55f252fa3a197a;p=thirdparty%2Fsystemd.git

network: assume enslaved when master ifindex is positive
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index b3aa5bd8074..4afd540d201 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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;
 }