From 1f024462d189277d53a18955ab55f252fa3a197a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 3 Sep 2021 08:04:29 +0900 Subject: [PATCH] network: assume enslaved when master ifindex is positive --- src/network/networkd-link.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index b3aa5bd807..4afd540d20 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; } -- 2.25.1