From: Tom Gundersen <teg@jklm.no>
Date: Mon, 10 Feb 2014 22:01:47 +0000 (+0100)
Subject: networkd: link - correctly skip state ENSLAVING when no vlans configured
X-Git-Tag: v209~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=63ffa72022b176a44d4cd134c901e9e1847e05d5;p=elogind.git

networkd: link - correctly skip state ENSLAVING when no vlans configured

This fixes a regression introduced in 672682a6b
---

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) {