From 2a5948f715b1b4a5510b723755a263602349a8af Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 19 Aug 2014 17:50:38 +0200 Subject: [PATCH] networkd: link - don't enforce ENSLAVING state We are only guaranteed to stay in ENSLAVING state whilst enslaving by bridges/bonds, not when adding stacked devices (as then the underlying device can be IFF_UP'ed and configured in parallel), so drop these asserts. --- src/network/networkd-link.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 248022133..b5f5863e6 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1052,7 +1052,6 @@ static int link_joined(Link *link) { int r; assert(link); - assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); if (!(link->flags & IFF_UP)) { @@ -1072,8 +1071,6 @@ static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, int r; assert(link); - assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED, - LINK_STATE_LINGER)); assert(link->network); link->enslaving --; -- 2.30.2