X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=56f7bddd06c56048b539b2b7ddfe68ccbca4bc2d;hp=161fbe777af9148cbff895111dcd443fbf15d188;hb=8795f9ef89626cd658f615c78c6a17e990c0dcaa;hpb=922c169147fc6e4c4ecf94029528192636e917e7

diff --git a/ubus.c b/ubus.c
index 161fbe7..56f7bdd 100644
--- a/ubus.c
+++ b/ubus.c
@@ -166,38 +166,12 @@ error:
 	return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
-static int
-netifd_del_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
-		      struct ubus_request_data *req, const char *method,
-		      struct blob_attr *msg)
-{
-	struct blob_attr *tb[__DI_MAX];
-	struct interface *iface;
-
-	blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (!tb[DI_NAME])
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	const char *name = blobmsg_get_string(tb[DI_NAME]);
-	iface = vlist_find(&interfaces, name, iface, node);
-
-	if (!iface)
-		return UBUS_STATUS_NOT_FOUND;
-	else if (!iface->dynamic)
-		return UBUS_STATUS_INVALID_COMMAND;
-
-	vlist_delete(&interfaces, &iface->node);
-	return UBUS_STATUS_OK;
-}
-
 static struct ubus_method main_object_methods[] = {
 	{ .name = "restart", .handler = netifd_handle_restart },
 	{ .name = "reload", .handler = netifd_handle_reload },
 	UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
 	{ .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
 	UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
-	UBUS_METHOD("del_dynamic", netifd_del_dynamic, dynamic_policy),
 };
 
 static struct ubus_object_type main_object_type =
@@ -687,7 +661,7 @@ netifd_dump_status(struct interface *iface)
 		blobmsg_add_string(&b, "proto", iface->proto_handler->name);
 
 	dev = iface->main_dev.dev;
-	if (dev && !dev->hidden &&
+	if (dev && !dev->hidden && iface->proto_handler &&
 	    !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
 		blobmsg_add_string(&b, "device", dev->ifname);