X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=60efc7e43950fc8f28bc97289cee59ea1a5089ca;hp=705bdd34f737b0b223bab31aaccc90f5771b1a05;hb=98565127c60cba3d5b747bb9eb698e06d187f45b;hpb=02d75b311c18bb7aaea966e0548c77912436ba92

diff --git a/interface.c b/interface.c
index 705bdd3..60efc7e 100644
--- a/interface.c
+++ b/interface.c
@@ -86,7 +86,8 @@ mark_interface_down(struct interface *iface)
 {
 	vlist_flush_all(&iface->proto_addr);
 	vlist_flush_all(&iface->proto_route);
-	device_release(&iface->main_dev);
+	if (iface->main_dev.dev)
+		device_release(&iface->main_dev);
 	iface->state = IFS_DOWN;
 }
 
@@ -98,9 +99,11 @@ __interface_set_up(struct interface *iface)
 	if (iface->state != IFS_DOWN)
 		return 0;
 
-	ret = device_claim(&iface->main_dev);
-	if (ret)
-		return ret;
+	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);
@@ -145,6 +148,12 @@ interface_cb(struct device_user *dep, enum device_event ev)
 		return;
 	}
 
+	interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
 	if (iface->available == new_state)
 		return;
 
@@ -176,6 +185,13 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
 		mark_interface_down(iface);
 		break;
+	case IFPEV_LINK_LOST:
+		if (iface->state != IFS_UP)
+			return;
+
+		iface->state = IFS_SETUP;
+		interface_event(iface, IFEV_DOWN);
+		break;
 	}
 }
 
@@ -210,7 +226,7 @@ interface_alloc(const char *name, struct blob_attr *attr)
 
 	iface = calloc(1, sizeof(*iface));
 	iface->main_dev.cb = interface_cb;
-	iface->l3_iface = &iface->main_dev;
+	iface->l3_dev = &iface->main_dev;
 	strncpy(iface->name, name, sizeof(iface->name) - 1);
 	list_add_tail(&iface->list, &interfaces);
 	INIT_LIST_HEAD(&iface->errors);
@@ -225,7 +241,9 @@ interface_alloc(const char *name, struct blob_attr *attr)
 
 	proto_attach_interface(iface, proto_name);
 
-	if ((cur = tb[IFACE_ATTR_IFNAME])) {
+	if (iface->proto_handler &&
+	    !(iface->proto_handler->flags & PROTO_FLAG_NODEV) &&
+	    (cur = tb[IFACE_ATTR_IFNAME])) {
 		dev = device_get(blobmsg_data(cur), true);
 		if (dev)
 			device_add_user(&iface->main_dev, dev);
@@ -312,8 +330,13 @@ interface_set_up(struct interface *iface)
 int
 interface_set_down(struct interface *iface)
 {
-	iface->autostart = false;
-	__interface_set_down(iface, false);
+	if (!iface) {
+		list_for_each_entry(iface, &interfaces, list)
+			__interface_set_down(iface, false);
+	} else {
+		iface->autostart = false;
+		__interface_set_down(iface, false);
+	}
 
 	return 0;
 }