X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=6f8d3b7c50876b30245cc97db2c01b8431380f65;hp=4f3a3cd77fd5860190f44a2797a9fc038c88e789;hb=2152229c45f470a14dee33507b331ac38055e062;hpb=f6b38cb7c9ad0e7feba7cb7d2a1678af5e032000

diff --git a/config.c b/config.c
index 4f3a3cd..6f8d3b7 100644
--- a/config.c
+++ b/config.c
@@ -132,7 +132,7 @@ config_parse_bridge_interface(struct uci_section *s)
 
 	uci_to_blob(&b, s, bridge_device_type.config_params);
 	if (!device_create(name, &bridge_device_type, b.head)) {
-		DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+		D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
 		return -EINVAL;
 	}
 
@@ -148,8 +148,6 @@ config_parse_interface(struct uci_section *s)
 	const char *type;
 	struct blob_attr *config;
 
-	DPRINTF("Create interface '%s'\n", s->e.name);
-
 	blob_buf_init(&b, 0);
 
 	type = uci_lookup_option_string(uci_ctx, s, "type");
@@ -223,7 +221,7 @@ config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
 		if (blob_len(tb1[i]) != blob_len(tb2[i]))
 			goto mark;
 
-		if (memcmp(tb1[i], tb2[i], blob_pad_len(tb1[i])) != 0)
+		if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
 			goto mark;
 
 		continue;
@@ -331,6 +329,7 @@ config_init_interfaces(const char *name)
 	uci_network = p;
 	config_init = true;
 
+	device_reset_config();
 	config_init_devices();
 
 	uci_foreach_element(&p->sections, e) {
@@ -342,8 +341,10 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	device_free_unused(NULL);
 	config_init = false;
 
+	device_reset_old();
+	device_init_pending();
+	device_free_unused(NULL);
 	interface_start_pending();
 }