bridge: keep existing mac address if specified in the config

diff --git a/bridge.c b/bridge.c
index 1725162..361b409 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -102,7 +102,12 @@ bridge_reset_primary(struct bridge_state *bst)
 {
        struct bridge_member *bm;
 
 {
        struct bridge_member *bm;
 

+       if (!bst->primary_port &&
+           (bst->dev.settings.flags & DEV_OPT_MACADDR))
+               return;
+

        bst->primary_port = NULL;
        bst->primary_port = NULL;

+       bst->dev.settings.flags &= ~DEV_OPT_MACADDR;

        vlist_for_each_element(&bst->members, bm, node) {
                if (!bm->present)
                        continue;
        vlist_for_each_element(&bst->members, bm, node) {
                if (!bm->present)
                        continue;