X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=config.c;h=4158cc8365d12acb3fd347c6167e627e6677709f;hb=5eefbc1a53e34db35c9a567d147c6d0bd341cf18;hp=9f4247125ca752e0fe52a9555171b26ddad0545a;hpb=f8276b9b149f3b0c8f3cdf8d3d0c232bd92e3464;p=project%2Fnetifd.git

diff --git a/config.c b/config.c
index 9f42471..4158cc8 100644
--- a/config.c
+++ b/config.c
@@ -330,34 +330,37 @@ config_init_package(const char *config)
 	return p;
 }
 
-void
-config_init_interfaces(const char *name)
+static void
+config_init_interfaces(void)
 {
-	struct uci_package *p = NULL;
 	struct uci_element *e;
 
-	p = config_init_package("network");
-	if (!p) {
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "interface"))
+			config_parse_interface(s);
+	}
+}
+
+void
+config_init_all(void)
+{
+	uci_network = config_init_package("network");
+	if (!uci_network) {
 		fprintf(stderr, "Failed to load network config\n");
 		return;
 	}
 
-	uci_network = p;
 	config_init = true;
+	device_lock();
 
 	device_reset_config();
 	config_init_devices();
+	config_init_interfaces();
 
-	uci_foreach_element(&p->sections, e) {
-		struct uci_section *s = uci_to_section(e);
-
-		if (name && strcmp(s->e.name, name) != 0)
-			continue;
-
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
-	}
 	config_init = false;
+	device_unlock();
 
 	device_reset_old();
 	device_init_pending();