cmake: fix build by reordering the cflags definitions

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index 15e09dd1c26dc31d382617653d88e1d67025822b..6306bec9ca73e73ab7dc628f26d7e0efbc7fbfd6 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -339,10 +339,8 @@ static void bridge_stp_notify(struct bridge_state *bst)
        if (cfg->stp_proto)
                blobmsg_add_string(&b, "proto", cfg->stp_proto);
        blobmsg_add_u32(&b, "forward_delay", cfg->forward_delay);
-       if (cfg->flags & BRIDGE_OPT_HELLO_TIME)
-               blobmsg_add_u32(&b, "hello_time", cfg->hello_time);
-       if (cfg->flags & BRIDGE_OPT_MAX_AGE)
-               blobmsg_add_u32(&b, "max_age", cfg->max_age);
+       blobmsg_add_u32(&b, "hello_time", cfg->hello_time);
+       blobmsg_add_u32(&b, "max_age", cfg->max_age);
        if (cfg->flags & BRIDGE_OPT_AGEING_TIME)
                blobmsg_add_u32(&b, "ageing_time", cfg->ageing_time);
        netifd_ubus_device_notify("stp_init", b.head, 1000);
@@ -514,8 +512,6 @@ restart:
                goto restart;
        }
 
-       device_lock();
-
        device_remove_user(&bm->dev);
        uloop_timeout_cancel(&bm->check_timer);
 
@@ -531,8 +527,6 @@ restart:
                device_set_present(dev, true);
        }
 
-       device_unlock();
-
        free(bm);
 }
 
@@ -788,7 +782,7 @@ bridge_hotplug_set_member_vlans(struct bridge_state *bst, struct blob_attr *vlan
 {
        struct bridge_vlan *vlan;
        struct blob_attr *cur;
-       int rem;
+       size_t rem;
 
        if (!vlans)
                return;
@@ -940,7 +934,7 @@ bridge_dump_port(struct blob_buf *b, struct bridge_vlan_port *port)
        bool tagged = !(port->flags & BRVLAN_F_UNTAGGED);
        bool pvid = (port->flags & BRVLAN_F_PVID);
 
-       blobmsg_printf(b, "%s%s%s%s\n", port->ifname,
+       blobmsg_printf(b, NULL, "%s%s%s%s", port->ifname,
                tagged || pvid ? ":" : "",
                tagged ? "t" : "",
                pvid ? "*" : "");
@@ -1010,7 +1004,8 @@ bridge_config_init(struct device *dev)
        struct bridge_state *bst;
        struct bridge_vlan *vlan;
        struct blob_attr *cur;
-       int i, rem;
+       size_t rem;
+       int i;
 
        bst = container_of(dev, struct bridge_state, dev);
 
@@ -1045,7 +1040,6 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
        memset(cfg, 0, sizeof(*cfg));
        cfg->stp = false;
        cfg->stp_kernel = false;
-       cfg->forward_delay = 2;
        cfg->robustness = 2;
        cfg->igmp_snoop = false;
        cfg->multicast_querier = false;
@@ -1057,6 +1051,10 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
        cfg->priority = 0x7FFF;
        cfg->vlan_filtering = false;
 
+       cfg->forward_delay = 8;
+       cfg->max_age = 10;
+       cfg->hello_time = 1;
+
        if ((cur = tb[BRIDGE_ATTR_STP]))
                cfg->stp = blobmsg_get_bool(cur);
 
@@ -1106,15 +1104,11 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
                cfg->flags |= BRIDGE_OPT_AGEING_TIME;
        }
 
-       if ((cur = tb[BRIDGE_ATTR_HELLO_TIME])) {
+       if ((cur = tb[BRIDGE_ATTR_HELLO_TIME]))
                cfg->hello_time = blobmsg_get_u32(cur);
-               cfg->flags |= BRIDGE_OPT_HELLO_TIME;
-       }
 
-       if ((cur = tb[BRIDGE_ATTR_MAX_AGE])) {
+       if ((cur = tb[BRIDGE_ATTR_MAX_AGE]))
                cfg->max_age = blobmsg_get_u32(cur);
-               cfg->flags |= BRIDGE_OPT_MAX_AGE;
-       }
 
        if ((cur = tb[BRIDGE_ATTR_BRIDGE_EMPTY]))
                cfg->bridge_empty = blobmsg_get_bool(cur);