bridge: add support for configuring extra tagged vlans on member devices

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index d83ea9cb6b6c77ef012b7481aa0f332055bb61da..e1c01e12994ba222e062e633e5094b2aafa65c02 100644 (file)
--- a/config.c
+++ b/config.c
@@ -337,7 +337,7 @@ config_parse_vlan(struct device *dev, struct uci_section *s)
        char *name_buf;
        int name_len = 0;
        int n_ports = 0;
-       int rem;
+       size_t rem;
 
        val = uci_lookup_option_string(uci_ctx, s, "vlan");
        if (!val)
@@ -762,7 +762,6 @@ config_init_all(void)
 
        vlist_update(&interfaces);
        config_init = true;
-       device_lock();
 
        device_reset_config();
        config_init_devices(true);
@@ -775,12 +774,10 @@ config_init_all(void)
        config_init_wireless();
 
        config_init = false;
-       device_unlock();
 
        device_reset_old();
        device_init_pending();
        vlist_flush(&interfaces);
-       device_free_unused(NULL);
        interface_refresh_assignments(false);
        interface_start_pending();
        wireless_start_pending();