X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=257eaca5a705310e916b4941c43258c15d1b77ed;hp=ca641aeb1bec9c5602211d25780a739bd55ae209;hb=91fa29a0d17b40963f67f08e740ca0a07365db90;hpb=d76dbcf653fc15719cd9d6bb2ab258b94eada46a

diff --git a/interface.c b/interface.c
index ca641ae..257eaca 100644
--- a/interface.c
+++ b/interface.c
@@ -100,34 +100,12 @@ interface_flush_state(struct interface *iface)
 static void
 mark_interface_down(struct interface *iface)
 {
+	if (iface->state == IFS_UP)
+		interface_event(iface, IFEV_DOWN);
 	interface_flush_state(iface);
 	iface->state = IFS_DOWN;
 }
 
-static int
-__interface_set_up(struct interface *iface)
-{
-	int ret;
-
-	if (iface->state != IFS_DOWN)
-		return 0;
-
-	if (iface->main_dev.dev) {
-		ret = device_claim(&iface->main_dev);
-		if (ret)
-			return ret;
-	}
-
-	iface->state = IFS_SETUP;
-	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
-	if (ret) {
-		mark_interface_down(iface);
-		return ret;
-	}
-
-	return 0;
-}
-
 void
 __interface_set_down(struct interface *iface, bool force)
 {
@@ -137,8 +115,9 @@ __interface_set_down(struct interface *iface, bool force)
 		iface->state == IFS_TEARDOWN)
 		return;
 
+	if (iface->state == IFS_UP)
+		interface_event(iface, IFEV_DOWN);
 	iface->state = IFS_TEARDOWN;
-	interface_event(iface, IFEV_DOWN);
 	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 	if (force)
 		interface_flush_state(iface);
@@ -208,6 +187,8 @@ interface_claim_device(struct interface *iface)
 		if (dev)
 			device_add_user(&iface->main_dev, dev);
 	}
+	if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
+		interface_set_available(iface, true);
 }
 
 
@@ -242,9 +223,8 @@ static void
 interface_do_reload(struct interface *iface)
 {
 	interface_cleanup(iface);
-
-	interface_claim_device(iface);
 	proto_init_interface(iface, iface->config);
+	interface_claim_device(iface);
 }
 
 static void
@@ -297,8 +277,9 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			return;
 
 		netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
+		if (iface->state == IFS_UP)
+			interface_event(iface, IFEV_DOWN);
 		iface->state = IFS_SETUP;
-		interface_event(iface, IFEV_DOWN);
 		break;
 	}
 }
@@ -400,6 +381,8 @@ interface_add_link(struct interface *iface, struct device *dev)
 int
 interface_set_up(struct interface *iface)
 {
+	int ret;
+
 	iface->autostart = true;
 
 	if (iface->state != IFS_DOWN)
@@ -411,7 +394,20 @@ interface_set_up(struct interface *iface)
 		return -1;
 	}
 
-	return __interface_set_up(iface);
+	if (iface->main_dev.dev) {
+		ret = device_claim(&iface->main_dev);
+		if (ret)
+			return ret;
+	}
+
+	iface->state = IFS_SETUP;
+	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+	if (ret) {
+		mark_interface_down(iface);
+		return ret;
+	}
+
+	return 0;
 }
 
 int
@@ -485,8 +481,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	if_old->ifname = if_new->ifname;
 	if_old->proto_handler = if_new->proto_handler;
 
-	if (strcmp(old_ifname, if_new->ifname) != 0 ||
-		proto != if_new->proto_handler) {
+	if ((!!old_ifname != !!if_new->ifname) ||
+	    (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
+	    proto != if_new->proto_handler) {
 		D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
 		  if_old->name);
 		goto reload;
@@ -526,8 +523,8 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
 		set_config_state(if_old, IFC_REMOVE);
 	} else if (node_new) {
 		D(INTERFACE, "Create interface '%s'\n", if_new->name);
-		interface_claim_device(if_new);
 		proto_init_interface(if_new, if_new->config);
+		interface_claim_device(if_new);
 		netifd_ubus_add_interface(if_new);
 	}
 }