chiark / gitweb /
networkd: link - correctly skip state ENSLAVING when no vlans configured
authorTom Gundersen <teg@jklm.no>
Mon, 10 Feb 2014 22:01:47 +0000 (23:01 +0100)
committerTom Gundersen <teg@jklm.no>
Mon, 10 Feb 2014 22:01:47 +0000 (23:01 +0100)
This fixes a regression introduced in 672682a6b

src/network/networkd-link.c

index 5e76306..39c61d8 100644 (file)
@@ -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) {