X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=1e465c5be0702f8d601d44c85c7747a056069124;hp=4e98f60309c9bac243353d3d1607820746d8b4cb;hb=71016cda9739642fd49ffa949555e7240b7b1284;hpb=cd8b6676df948be45586b606cb32538b81e43f40

diff --git a/config.c b/config.c
index 4e98f60..1e465c5 100644
--- a/config.c
+++ b/config.c
@@ -69,8 +69,8 @@ static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
 	free(str);
 }
 
-static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
-			const struct config_param_list *p)
+static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			  const struct config_param_list *p)
 {
 	const struct blobmsg_policy *attr;
 	struct uci_element *e;
@@ -107,6 +107,16 @@ static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
 	}
 }
 
+static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			const struct config_param_list *p)
+{
+	int i;
+
+	__uci_to_blob(b, s, p);
+	for (i = 0; i < p->n_next; i++)
+		uci_to_blob(b, s, p->next[i]);
+}
+
 static void
 config_parse_interface(struct uci_section *s)
 {
@@ -114,11 +124,11 @@ config_parse_interface(struct uci_section *s)
 
 	blob_buf_init(&b, 0);
 	uci_to_blob(&b, s, &interface_attr_list);
-	alloc_interface(s->e.name, s, b.head);
+	interface_alloc(s->e.name, s, b.head);
 }
 
 void
-config_device_inits(void)
+config_init_devices(void)
 {
 	struct uci_element *e;
 
@@ -154,7 +164,7 @@ config_init_interfaces(const char *name)
 	uci_network = p;
 	config_init = true;
 
-	config_device_inits();
+	config_init_devices();
 
 	uci_foreach_element(&p->sections, e) {
 		struct uci_section *s = uci_to_section(e);
@@ -168,5 +178,5 @@ config_init_interfaces(const char *name)
 	device_free_all();
 	config_init = false;
 
-	start_pending_interfaces();
+	interface_start_pending();
 }