X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=acfe8b156457d60c1c788899d5a728e4ef9bdd06;hp=031959ccb4a52e9c18c77acb52499b7e8f054f86;hb=f505119b07b89ad23f4264e77b0bf0f0c0400399;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/interface.c b/interface.c
index 031959c..acfe8b1 100644
--- a/interface.c
+++ b/interface.c
@@ -19,10 +19,6 @@ enum {
 	IFACE_ATTR_MAX
 };
 
-static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
-	[IFACE_ATTR_IFNAME].type = BLOBMSG_TYPE_STRING,
-};
-
 static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
@@ -32,7 +28,6 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 const struct config_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
-	.info = iface_attr_info,
 };
 
 static void
@@ -91,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;
 }
 
@@ -103,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);
@@ -150,10 +148,16 @@ interface_cb(struct device_user *dep, enum device_event ev)
 		return;
 	}
 
-	if (iface->active == new_state)
+	interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
+	if (iface->available == new_state)
 		return;
 
-	iface->active = new_state;
+	iface->available = new_state;
 
 	if (new_state) {
 		if (iface->autostart && !config_init)
@@ -230,7 +234,8 @@ 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->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);
@@ -303,7 +308,7 @@ interface_set_up(struct interface *iface)
 {
 	iface->autostart = true;
 
-	if (!iface->active) {
+	if (!iface->available) {
 		interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
 		return -1;
 	}
@@ -317,8 +322,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;
 }
@@ -329,7 +339,7 @@ interface_start_pending(void)
 	struct interface *iface;
 
 	list_for_each_entry(iface, &interfaces, list) {
-		if (iface->active && iface->autostart)
+		if (iface->available && iface->autostart)
 			interface_set_up(iface);
 	}
 }