From 63ffa72022b176a44d4cd134c901e9e1847e05d5 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 10 Feb 2014 23:01:47 +0100
Subject: [PATCH] networkd: link - correctly skip state ENSLAVING when no vlans
 configured

This fixes a regression introduced in 672682a6b
---
 src/network/networkd-link.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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