X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubus.c;h=2b8bb9007dcd38a4873e49d308c7874bd9473d5b;hb=83d3a901d3178a8840092b6e4f7f829b89da4ba0;hp=454b42d167562010ec53059bd157948d11e0de03;hpb=6a84e770ed9f4ea0ffe9b20625f8f15868f5424b;p=project%2Fnetifd.git

diff --git a/ubus.c b/ubus.c
index 454b42d..2b8bb90 100644
--- a/ubus.c
+++ b/ubus.c
@@ -290,7 +290,7 @@ netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!cur)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	dev = device_get(blobmsg_data(cur), false);
+	dev = device_find(blobmsg_data(cur));
 	if (!dev)
 		return UBUS_STATUS_NOT_FOUND;
 
@@ -685,7 +685,7 @@ netifd_dump_status(struct interface *iface)
 		if (iface->ip4table)
 			blobmsg_add_u32(&b, "ip4table", iface->ip4table);
 		if (iface->ip6table)
-			blobmsg_add_u32(&b, "ip6table", iface->ip6table);		  
+			blobmsg_add_u32(&b, "ip6table", iface->ip6table);
 		blobmsg_add_u32(&b, "metric", iface->metric);
 		blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation);
 		a = blobmsg_open_array(&b, "ipv4-address");
@@ -969,6 +969,9 @@ static void netifd_add_iface_object(void)
 	int i;
 
 	methods = calloc(1, sizeof(iface_object_methods));
+	if (!methods)
+		return;
+
 	memcpy(methods, iface_object_methods, sizeof(iface_object_methods));
 	iface_object.methods = methods;