nterface-ip: remove superfluous iface check in interface_ip_set_enabled()

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index 8e6c9a6..96e0209 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -240,15 +240,15 @@ bridge_remove_member(struct bridge_member *bm)
        if (!bm->present)
                return;
 
-       if (bm == bst->primary_port)
-               bridge_reset_primary(bst);
-
        if (bst->dev.active)
                bridge_disable_member(bm);
 
        bm->present = false;
        bm->bst->n_present--;
 
+       if (bm == bst->primary_port)
+               bridge_reset_primary(bst);
+
        if (bst->config.bridge_empty)
                return;
 
@@ -394,24 +394,25 @@ bridge_set_state(struct device *dev, bool up)
 }
 
 static struct bridge_member *
-bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
+bridge_create_member(struct bridge_state *bst, const char *name,
+                    struct device *dev, bool hotplug)
 {
        struct bridge_member *bm;
 
-       bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1);
+       bm = calloc(1, sizeof(*bm) + strlen(name) + 1);
        if (!bm)
                return NULL;
 
        bm->bst = bst;
        bm->dev.cb = bridge_member_cb;
        bm->dev.hotplug = hotplug;
-       strcpy(bm->name, dev->ifname);
+       strcpy(bm->name, name);
        bm->dev.dev = dev;
        vlist_add(&bst->members, &bm->node, bm->name);
        // Need to look up the bridge member again as the above
        // created pointer will be freed in case the bridge member
        // already existed
-       bm = vlist_find(&bst->members, dev->ifname, bm, node);
+       bm = vlist_find(&bst->members, name, bm, node);
        if (hotplug && bm)
                bm->node.version = -1;
 
@@ -455,7 +456,7 @@ bridge_add_member(struct bridge_state *bst, const char *name)
        if (!dev)
                return;
 
-       bridge_create_member(bst, dev, false);
+       bridge_create_member(bst, name, dev, false);
 }
 
 static int
@@ -463,7 +464,7 @@ bridge_hotplug_add(struct device *dev, struct device *member)
 {
        struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
 
-       bridge_create_member(bst, member, true);
+       bridge_create_member(bst, member->ifname, member, true);
 
        return 0;
 }
@@ -523,8 +524,12 @@ bridge_dump_info(struct device *dev, struct blob_buf *b)
        system_if_dump_info(dev, b);
        list = blobmsg_open_array(b, "bridge-members");
 
-       vlist_for_each_element(&bst->members, bm, node)
+       vlist_for_each_element(&bst->members, bm, node) {
+               if (bm->dev.dev->hidden)
+                       continue;
+
                blobmsg_add_string(b, NULL, bm->dev.dev->ifname);
+       }
 
        blobmsg_close_array(b, list);
 }
@@ -563,8 +568,6 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
        /* defaults */
        cfg->stp = false;
        cfg->forward_delay = 2;
-       cfg->igmp_snoop = true;
-       cfg->multicast_querier = true;
        cfg->robustness = 2;
        cfg->query_interval = 12500;
        cfg->query_response_interval = 1000;
@@ -650,6 +653,9 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
        blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, tb_br,
                blob_data(attr), blob_len(attr));
 
+       if (tb_dev[DEV_ATTR_MACADDR])
+               bst->primary_port = NULL;
+
        bst->ifnames = tb_br[BRIDGE_ATTR_IFNAME];
        device_init_settings(dev, tb_dev);
        bridge_apply_settings(bst, tb_br);