X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=7e2d1edbd0a24dda792c65d218bb4ae14d7f48ab;hp=9fb9c010d8bceac8487881e1ef2253ef04f3c258;hb=942aa06b7e8b74680b18022f7d002a8013b7bd5d;hpb=d620bdae7081eafce2a4b3e6da0aa2116d71fbc8

diff --git a/config.c b/config.c
index 9fb9c01..7e2d1ed 100644
--- a/config.c
+++ b/config.c
@@ -11,6 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -173,8 +174,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)
@@ -198,12 +201,22 @@ 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) {
+			device_create(name, devtype, b.head);
+		} else {
+			dev = device_get(name, 1);
+			if (!dev)
+				continue;
+
+			device_set_config(dev, dev->type, b.head);
+		}
 	}
 }
 
@@ -332,16 +345,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