X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=interface.c;h=d0eec4a7b70d45c89bd9347e5aaf4af21059a0e1;hb=e284f0d534d5caccebdb2c898e593fb5b13a9d39;hp=0f54d51c13a143d8d771c4ea4ecd4743f3a860e1;hpb=ea6dec1329b08109387f091b60a13d1b40839317;p=project%2Fnetifd.git

diff --git a/interface.c b/interface.c
index 0f54d51..d0eec4a 100644
--- a/interface.c
+++ b/interface.c
@@ -93,6 +93,8 @@ interface_flush_state(struct interface *iface)
 	interface_ip_flush(&iface->proto_ip);
 	if (iface->main_dev.dev)
 		device_release(&iface->main_dev);
+	if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
+		device_release(iface->l3_dev);
 }
 
 static void
@@ -102,30 +104,6 @@ mark_interface_down(struct interface *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)
 {
@@ -240,12 +218,8 @@ static void
 interface_do_reload(struct interface *iface)
 {
 	interface_cleanup(iface);
-
-	interface_claim_device(iface);
 	proto_init_interface(iface, iface->config);
-
-	if (iface->autostart && !config_init)
-		interface_set_up(iface);
+	interface_claim_device(iface);
 }
 
 static void
@@ -259,8 +233,10 @@ interface_handle_config_change(struct interface *iface)
 		break;
 	case IFC_REMOVE:
 		interface_do_free(iface);
-		break;
+		return;
 	}
+	if (iface->autostart && iface->available)
+		interface_set_up(iface);
 }
 
 static void
@@ -290,10 +266,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		system_flush_routes();
 		mark_interface_down(iface);
 		interface_handle_config_change(iface);
-		if (iface->l3_dev->dev)
-			device_release(iface->l3_dev);
-		if (iface->autostart && iface->available)
-			__interface_set_up(iface);
 		break;
 	case IFPEV_LINK_LOST:
 		if (iface->state != IFS_UP)
@@ -403,6 +375,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)
@@ -414,7 +388,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