X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=8be8727906ea5636d567b9c9f56e79d9801aa788;hp=78cfe125c180aa8f49a43c29d6ec531e208d29c2;hb=aa76c9ee78146f97512f96524d3abb94210040a5;hpb=d5202486636818e3ff48ede9d3e06c886c659c0a

diff --git a/interface.c b/interface.c
index 78cfe12..8be8727 100644
--- a/interface.c
+++ b/interface.c
@@ -3,6 +3,8 @@
 #include <stdio.h>
 
 #include "netifd.h"
+#include "device.h"
+#include "interface.h"
 #include "proto.h"
 #include "ubus.h"
 
@@ -59,6 +61,13 @@ interface_event(struct interface *iface, enum interface_event ev)
 	/* TODO */
 }
 
+static void
+mark_interface_down(struct interface *iface)
+{
+	release_device(iface->main_dev.dev);
+	iface->state = IFS_DOWN;
+}
+
 static int
 __set_interface_up(struct interface *iface)
 {
@@ -69,20 +78,17 @@ __set_interface_up(struct interface *iface)
 
 	ret = claim_device(iface->main_dev.dev);
 	if (ret)
-		goto out;
+		return ret;
 
 	iface->state = IFS_SETUP;
 	ret = iface->proto->handler(iface->proto, PROTO_CMD_SETUP, false);
-	if (ret)
-		goto release;
+	if (ret) {
+		mark_interface_down(iface);
+		return ret;
+	}
 
 	return 0;
 
-release:
-	release_device(iface->main_dev.dev);
-out:
-	iface->state = IFS_DOWN;
-	return ret;
 }
 
 static void
@@ -145,7 +151,10 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		interface_event(iface, IFEV_UP);
 		break;
 	case IFPEV_DOWN:
-		iface->state = IFS_DOWN;
+		if (iface->state == IFS_DOWN)
+			return;
+
+		mark_interface_down(iface);
 		break;
 	}
 }