X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=ba97a5c01593a65b8d0628ad0ea1bab37f84e806;hp=5a2e439b9294381a38ad6a7f6579ba26eb7bb433;hb=e472b121daaef2efc3301445207e4c9ad69b06ae;hpb=ea6dec1329b08109387f091b60a13d1b40839317

diff --git a/config.c b/config.c
index 5a2e439..ba97a5c 100644
--- a/config.c
+++ b/config.c
@@ -176,6 +176,14 @@ config_parse_interface(struct uci_section *s)
 	memcpy(config, b.head, blob_pad_len(b.head));
 	interface_add(iface, config);
 
+	/*
+	 * need to look up the interface name again, in case of config update,
+	 * the pointer will have changed
+	 */
+	iface = vlist_find(&interfaces, s->e.name, iface, node);
+	if (!iface)
+		return;
+
 	dev = iface->main_dev.dev;
 	if (!dev || !dev->default_config)
 		return;
@@ -337,7 +345,7 @@ config_init_package(const char *config)
 			uci_unload(ctx, p);
 	}
 
-	if (uci_load(ctx, "network", &p))
+	if (uci_load(ctx, config, &p))
 		return NULL;
 
 	return p;
@@ -387,6 +395,7 @@ config_init_all(void)
 		return;
 	}
 
+	vlist_update(&interfaces);
 	config_init = true;
 	device_lock();
 
@@ -401,5 +410,6 @@ config_init_all(void)
 	device_reset_old();
 	device_init_pending();
 	device_free_unused(NULL);
+	vlist_flush(&interfaces);
 	interface_start_pending();
 }