diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-02-10 23:01:47 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-02-10 23:01:47 +0100 |
| commit | 63ffa72022b176a44d4cd134c901e9e1847e05d5 (patch) | |
| tree | cff3ad7a416fa3340da5be7a9f42d0cd071bed81 /src | |
| parent | 672682a6b9d6fb6a3722c3fea1a93b4831747b54 (diff) | |
networkd: link - correctly skip state ENSLAVING when no vlans configured
This fixes a regression introduced in 672682a6b
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/networkd-link.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 5e763069f..39c61d8d0 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -876,7 +876,8 @@ static int link_enter_enslave(Link *link) { link->state = LINK_STATE_ENSLAVING; - if (!link->network->bridge && !link->network->bond && !link->network->vlans) + if (!link->network->bridge && !link->network->bond && + hashmap_isempty(link->network->vlans)) return link_enslaved(link); if (link->network->bridge) { |