projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubus.c: move disabled routes, ips, dns server into an "inactive" subtable
[project/netifd.git]
/
bridge.c
diff --git
a/bridge.c
b/bridge.c
index
1725162
..
d29c3c0
100644
(file)
--- a/
bridge.c
+++ b/
bridge.c
@@
-102,13
+102,24
@@
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) {
vlist_for_each_element(&bst->members, bm, node) {
+ uint8_t *macaddr;
+
if (!bm->present)
continue;
bst->primary_port = bm;
if (!bm->present)
continue;
bst->primary_port = bm;
- memcpy(bst->dev.settings.macaddr, bm->dev.dev->settings.macaddr, 6);
+ if (bm->dev.dev->settings.flags & DEV_OPT_MACADDR)
+ macaddr = bm->dev.dev->settings.macaddr;
+ else
+ macaddr = bm->dev.dev->orig_settings.macaddr;
+ memcpy(bst->dev.settings.macaddr, macaddr, 6);
bst->dev.settings.flags |= DEV_OPT_MACADDR;
return;
}
bst->dev.settings.flags |= DEV_OPT_MACADDR;
return;
}