summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-08-19 17:50:38 +0200
committerTom Gundersen <teg@jklm.no>2014-08-19 17:55:34 +0200
commit2a5948f715b1b4a5510b723755a263602349a8af (patch)
tree459b031141465e7457a89f972327eab99beb9768 /src/network
parent14a32924c9b46817c92ae11c1147a59dcb62012b (diff)
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.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-link.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 248022133f..b5f5863e6b 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 --;