X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=a970d50cb3cfad13e09426eec76fddb6ca49cc51;hp=83c9d792efb63d2a7c6ead746f945f60a066f4ce;hb=0f0fa4f1c8cb4f793c3dddd1edd1420483e9e325;hpb=2008ae9a80fb82b0018fd510043c291b58e7cc46 diff --git a/bridge.c b/bridge.c index 83c9d79..a970d50 100644 --- a/bridge.c +++ b/bridge.c @@ -464,6 +464,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb) cfg->stp = false; cfg->forward_delay = 2; cfg->igmp_snoop = true; + cfg->priority = 0x7FFF; if ((cur = tb[BRIDGE_ATTR_STP])) cfg->stp = blobmsg_get_bool(cur); @@ -471,10 +472,8 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb) if ((cur = tb[BRIDGE_ATTR_FORWARD_DELAY])) cfg->forward_delay = blobmsg_get_u32(cur); - if ((cur = tb[BRIDGE_ATTR_PRIORITY])) { + if ((cur = tb[BRIDGE_ATTR_PRIORITY])) cfg->priority = blobmsg_get_u32(cur); - cfg->flags |= BRIDGE_OPT_PRIORITY; - } if ((cur = tb[BRIDGE_ATTR_IGMP_SNOOP])) cfg->igmp_snoop = blobmsg_get_bool(cur);