X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=d134a9050cbcc5521fd58ffe02823ed28a1b5a7d;hp=8472d44f0ff9c9dcaa9e4d59699a45921cca8265;hb=46d52638f04c471a0e86d07ccae6a188f1a05ef5;hpb=581c0d568f6fa7348a164077d761a04d0bb2b4e8

diff --git a/config.c b/config.c
index 8472d44..d134a90 100644
--- a/config.c
+++ b/config.c
@@ -215,7 +215,7 @@ config_init_devices(void)
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
-		const struct device_type *devtype;
+		const struct device_type *devtype = NULL;
 		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
@@ -226,9 +226,14 @@ config_init_devices(void)
 			continue;
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-		if (type && !strcmp(type, "bridge"))
-			devtype = &bridge_device_type;
-		else
+		if (type) {
+			if (!strcmp(type, "bridge"))
+				devtype = &bridge_device_type;
+			else if (!strcmp(type, "tunnel"))
+				devtype = &tunnel_device_type;
+		}
+
+		if (!devtype)
 			devtype = &simple_device_type;
 
 		blob_buf_init(&b, 0);
@@ -395,6 +400,7 @@ config_init_all(void)
 		return;
 	}
 
+	vlist_update(&interfaces);
 	config_init = true;
 	device_lock();
 
@@ -409,5 +415,6 @@ config_init_all(void)
 	device_reset_old();
 	device_init_pending();
 	device_free_unused(NULL);
+	vlist_flush(&interfaces);
 	interface_start_pending();
 }