From: Mark Oteiza <mvoteiza@udel.edu>
Date: Wed, 5 Mar 2014 09:41:13 +0000 (+0100)
Subject: networkd: restore logic for enslaving to a master bonding interface
X-Git-Tag: v211~114
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=0ad6148e87cd1348be81d9e83c4364a09dab2c29;hp=a9a245c128af6c0418085062c60251bc51fa4a94

networkd: restore logic for enslaving to a master bonding interface

This partially reverts commit 54abf46, which unintentionally removed the
enslaving support for bonding interfaces
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c10d947589f..61e257c1d53 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1194,6 +1194,27 @@ static int link_enter_enslave(Link *link) {
                 link->enslaving ++;
         }
 
+        if (link->network->bond) {
+                log_struct_link(LOG_DEBUG, link,
+                                "MESSAGE=%s: enslaving by '%s'",
+                                link->ifname, link->network->bond->name,
+                                NETDEV(link->network->bond),
+                                NULL);
+
+                r = netdev_enslave(link->network->bond, link, &enslave_handler);
+                if (r < 0) {
+                        log_struct_link(LOG_WARNING, link,
+                                        "MESSAGE=%s: could not enslave by '%s': %s",
+                                        link->ifname, link->network->bond->name, strerror(-r),
+                                        NETDEV(link->network->bond),
+                                        NULL);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->enslaving ++;
+        }
+
         HASHMAP_FOREACH(vlan, link->network->vlans, i) {
                 log_struct_link(LOG_DEBUG, link,
                                 "MESSAGE=%s: enslaving by '%s'",