bridge: fix stray semicolon, fixes a bug in bridge primary port reset

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index 05f2ad6..0e06cc2 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -178,7 +178,7 @@ bridge_remove_member(struct bridge_member *bm)
        if (!bm->present)
                return;
 
-       if (bm == bst->primary_port);
+       if (bm == bst->primary_port)
                bridge_reset_primary(bst);
 
        if (bst->dev.active)
@@ -454,12 +454,11 @@ bridge_config_init(struct device *dev)
                device_set_present(&bst->dev, true);
        }
 
-       if (!bst->ifnames)
-               return;
-
        vlist_update(&bst->members);
-       blobmsg_for_each_attr(cur, bst->ifnames, rem) {
-               bridge_add_member(bst, blobmsg_data(cur));
+       if (bst->ifnames) {
+               blobmsg_for_each_attr(cur, bst->ifnames, rem) {
+                       bridge_add_member(bst, blobmsg_data(cur));
+               }
        }
        vlist_flush(&bst->members);
 }