Skip to content

Commit 2304841

Browse files
committed
bridge: reset primary on adding device to empty bridge
This means that when only wireless devices are on a bridge, the MAC is set to something predictable (otherwise a random MAC is used which differs on each bring-up).
1 parent 7901e66 commit 2304841

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

bridge.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,13 +778,16 @@ bridge_member_cb(struct device_user *dep, enum device_event ev)
778778
if (bridge_enable_member(bm))
779779
break;
780780

781+
if (ev == DEV_EVENT_ADD && nst->n_present == 1) {
782+
bridge_reset_primary(bst);
783+
}
781784
/*
782785
* Adding a bridge member can overwrite the bridge mtu
783786
* in the kernel, apply the bridge settings in case the
784787
* bridge mtu is set
785788
*/
786789
system_if_apply_settings(&bst->dev, &bst->dev.settings,
787-
DEV_OPT_MTU | DEV_OPT_MTU6);
790+
DEV_OPT_MTU | DEV_OPT_MTU6 | DEV_OPT_MACADDR);
788791
break;
789792
case DEV_EVENT_LINK_UP:
790793
if (!bst->has_vlans)

0 commit comments

Comments
 (0)