X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=eb2f754420f28f90c9b8c742279741e33b80ba61;hp=73da2ab5053e73cc36d97512e369e97cf7dfeebb;hb=d6ea48d146b4fa2905afa4acc2ff34b37ce5a623;hpb=314b33c511f8aa53c9fb97c6a9ad9d410f06af26

diff --git a/interface.c b/interface.c
index 73da2ab..eb2f754 100644
--- a/interface.c
+++ b/interface.c
@@ -31,7 +31,7 @@ const struct config_param_list interface_attr_list = {
 };
 
 static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
 {
 	struct interface_error *error, *tmp;
 
@@ -119,7 +119,7 @@ __interface_set_up(struct interface *iface)
 static void
 __interface_set_down(struct interface *iface, bool force)
 {
-	clear_interface_errors(iface);
+	interface_clear_errors(iface);
 
 	if (iface->state == IFS_DOWN ||
 		iface->state == IFS_TEARDOWN)
@@ -157,6 +157,7 @@ interface_set_available(struct interface *iface, bool new_state)
 	if (iface->available == new_state)
 		return;
 
+	D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
 	iface->available = new_state;
 
 	if (new_state) {
@@ -183,6 +184,7 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+	interface_clear_errors(iface);
 	if (iface->main_dev.dev)
 		device_remove_user(&iface->main_dev);
 	interface_set_proto_state(iface, NULL);
@@ -205,7 +207,7 @@ interface_do_reload(struct interface *iface)
 	interface_claim_device(iface);
 	proto_init_interface(iface, iface->config);
 
-	if (iface->autostart)
+	if (iface->autostart && !config_init)
 		interface_set_up(iface);
 }
 
@@ -307,11 +309,9 @@ interface_add(struct interface *iface, struct blob_attr *config)
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
 
-	if ((cur = tb[IFACE_ATTR_IFNAME])) {
+	if ((cur = tb[IFACE_ATTR_IFNAME]))
 		iface->ifname = blobmsg_data(cur);
 
-	}
-
 	iface->config = config;
 	vlist_add(&interfaces, &iface->node);
 }
@@ -393,7 +393,7 @@ set_config_state(struct interface *iface, enum interface_config_state s)
 	if (iface->state == IFS_DOWN)
 		interface_handle_config_change(iface);
 	else
-		interface_set_down(iface);
+		__interface_set_down(iface, false);
 }
 
 static void
@@ -401,6 +401,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 {
 	struct blob_attr *old_config = if_old->config;
 
+	interface_clear_errors(if_old);
 	if_old->config = if_new->config;
 	if (!if_old->config_autostart && if_new->config_autostart)
 		if_old->autostart = true;