[systemd-commits] src/network

[Tom Gundersen]

 src/network/networkd-link.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 63ffa72022b176a44d4cd134c901e9e1847e05d5
Author: Tom Gundersen <teg at jklm.no>
Date:   Mon Feb 10 23:01:47 2014 +0100

    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 5e76306..39c61d8 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) {