X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=132ec430a57066957f70dbe8b412f3eafaf3d615;hp=c2b7edfc34ca845f165407063aabe256b982e1b3;hb=3eea8576d48d9b20cc1c6b46f54c7345a39d13aa;hpb=bec8a74c53ec900acb0fb3e0c997393dc57f1263

diff --git a/config.c b/config.c
index c2b7edf..132ec43 100644
--- a/config.c
+++ b/config.c
@@ -136,7 +136,8 @@ config_parse_interface(struct uci_section *s, bool alias)
 	if (blob_len(b.head) == 0)
 		return;
 
-	device_set_config(dev, dev->type, b.head);
+	if (iface->device_config || dev->settings.flags)
+		device_apply_config(dev, dev->type, b.head);
 	return;
 error_free_config:
 	free(config);
@@ -174,8 +175,10 @@ config_init_devices(void)
 	struct uci_element *e;
 
 	uci_foreach_element(&uci_network->sections, e) {
+		const struct uci_blob_param_list *params = NULL;
 		struct uci_section *s = uci_to_section(e);
 		const struct device_type *devtype = NULL;
+		struct device *dev;
 		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
@@ -199,12 +202,26 @@ config_init_devices(void)
 				devtype = &tunnel_device_type;
 		}
 
-		if (!devtype)
-			devtype = &simple_device_type;
+		if (devtype)
+			params = devtype->config_params;
+		if (!params)
+			params = simple_device_type.config_params;
 
 		blob_buf_init(&b, 0);
-		uci_to_blob(&b, s, devtype->config_params);
-		device_create(name, devtype, b.head);
+		uci_to_blob(&b, s, params);
+		if (devtype) {
+			dev = device_create(name, devtype, b.head);
+			if (!dev)
+				continue;
+		} else {
+			dev = device_get(name, 1);
+			if (!dev)
+				continue;
+
+			dev->current_config = true;
+			device_apply_config(dev, dev->type, b.head);
+		}
+		dev->default_config = false;
 	}
 }
 
@@ -333,16 +350,14 @@ config_parse_wireless_device(struct uci_section *s)
 static void
 config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
-	char *name = NULL;
+	char *name;
 
-	if (s->anonymous) {
-		name = alloca(strlen(s->type) + 16);
-		asprintf(&name, "@%s[%d]", s->type, config_section_idx(s));
-	}
+	name = alloca(strlen(s->type) + 16);
+	sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
 	blob_buf_init(&b, 0);
 	uci_to_blob(&b, s, wdev->drv->interface.config);
-	wireless_interface_create(wdev, b.head, name ? name : s->e.name);
+	wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
 }
 
 static void