From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 22 Jan 2017 13:33:37 +0000 (+0100)
Subject: libubus: do not register/unregister with uloop during sync requests
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6f4e11e1db399074273944329883f9c35e7daef6;p=project%2Fubus.git

libubus: do not register/unregister with uloop during sync requests

This was leftover code from before this codepath was converted to
polling directly

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/libubus-req.c b/libubus-req.c
index 5dcd470..db5061c 100644
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -140,14 +140,9 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 			  int req_timeout)
 {
 	ubus_complete_handler_t complete_cb = req->complete_cb;
-	bool registered = ctx->sock.registered;
 	int status = UBUS_STATUS_NO_DATA;
 	int64_t timeout = 0, time_end = 0;
 
-	if (!registered) {
-		ubus_add_uloop(ctx);
-	}
-
 	if (req_timeout)
 		time_end = get_time_msec() + req_timeout;
 
@@ -186,12 +181,8 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 	if (req->complete_cb)
 		req->complete_cb(req, status);
 
-	if (!registered) {
-		uloop_fd_delete(&ctx->sock);
-
-		if (!ctx->stack_depth)
-			ctx->pending_timer.cb(&ctx->pending_timer);
-	}
+	if (!ctx->stack_depth && !ctx->sock.registered)
+		ctx->pending_timer.cb(&ctx->pending_timer);
 
 	return status;
 }