bridge: reset primary only after marking the member not present

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index c46d44e..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->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 (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;
 
        if (bst->config.bridge_empty)
                return;