netifd: allow disabling rule/rule6 config sections

[project/netifd.git] / bonding.c

diff --git a/bonding.c b/bonding.c
index 321f819a6f4b9ea0c2845e8a75a76e70840979d5..457fe515989910e84c670a79fa22de05b75f2433 100644 (file)
--- a/bonding.c
+++ b/bonding.c
@@ -221,10 +221,6 @@ bonding_enable_port(struct bonding_port *bp)
        if (!bp->present)
                return 0;
 
-       ret = bonding_set_active(bdev, true);
-       if (ret)
-               goto error;
-
        /* Disable IPv6 for bonding ports */
        if (!(bp->dev.dev->settings.flags & DEV_OPT_IPV6)) {
                bp->dev.dev->settings.ipv6 = 0;
@@ -233,7 +229,11 @@ bonding_enable_port(struct bonding_port *bp)
 
        ret = device_claim(&bp->dev);
        if (ret < 0)
-               goto error;
+               return ret;
+
+       ret = bonding_set_active(bdev, true);
+       if (ret)
+               goto release;
 
        dev = bp->dev.dev;
        if (dev->settings.auth && !dev->auth_status)
@@ -257,6 +257,7 @@ error:
        bdev->n_failed++;
        bp->present = false;
        bdev->n_present--;
+release:
        device_release(&bp->dev);
 
        return ret;
@@ -565,8 +566,6 @@ bonding_free_port(struct bonding_port *bp)
 
        bonding_remove_port(bp);
 
-       device_lock();
-
        device_remove_user(&bp->dev);
 
        /*
@@ -581,8 +580,6 @@ bonding_free_port(struct bonding_port *bp)
                device_set_present(dev, true);
        }
 
-       device_unlock();
-
        free(bp);
 }