From fc99617d4ca3f21574ec5c3f9fd1dae25e76c020 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Tue, 26 Mar 2024 12:41:42 +0000 Subject: [PATCH] Fix the refresh instances order --- bbfdmd/ubus/bbfdmd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bbfdmd/ubus/bbfdmd.c b/bbfdmd/ubus/bbfdmd.c index 0f391635..9870e0f4 100644 --- a/bbfdmd/ubus/bbfdmd.c +++ b/bbfdmd/ubus/bbfdmd.c @@ -597,8 +597,8 @@ int bbfdm_set_handler(struct ubus_context *ctx, struct ubus_object *obj, if (data.trans_id == 0) { // Internal transaction: need to commit the changes - register_instance_refresh_timer(ctx, 100); transaction_commit(NULL, trans_id, true); + register_instance_refresh_timer(ctx, 100); } end: @@ -721,8 +721,8 @@ int bbfdm_add_handler(struct ubus_context *ctx, struct ubus_object *obj, if (data.trans_id == 0) { // Internal transaction: need to abort the changes - register_instance_refresh_timer(ctx, 0); transaction_abort(NULL, trans_id); + register_instance_refresh_timer(ctx, 100); } goto end; @@ -740,8 +740,8 @@ int bbfdm_add_handler(struct ubus_context *ctx, struct ubus_object *obj, if (data.trans_id == 0) { // Internal transaction: need to abort the changes - register_instance_refresh_timer(ctx, 0); transaction_abort(NULL, trans_id); + register_instance_refresh_timer(ctx, 100); } free_pv_list(&pv_list); @@ -757,8 +757,8 @@ int bbfdm_add_handler(struct ubus_context *ctx, struct ubus_object *obj, if (data.trans_id == 0) { // Internal transaction: need to commit the changes - register_instance_refresh_timer(ctx, 100); transaction_commit(NULL, trans_id, true); + register_instance_refresh_timer(ctx, 100); } end: @@ -846,8 +846,8 @@ int bbfdm_del_handler(struct ubus_context *ctx, struct ubus_object *obj, if (data.trans_id == 0) { // Internal transaction: need to commit the changes - register_instance_refresh_timer(ctx, 100); transaction_commit(NULL, trans_id, true); + register_instance_refresh_timer(ctx, 100); } end: @@ -924,12 +924,12 @@ static int bbfdm_transaction_handler(struct ubus_context *ctx, struct ubus_objec transaction_status(&data.bb); } } else if (is_str_eq(trans_cmd, "commit")) { - register_instance_refresh_timer(ctx, 100); ret = transaction_commit(&data, data.trans_id, is_service_restart); + register_instance_refresh_timer(ctx, 100); blobmsg_add_u8(&data.bb, "status", (ret == 0)); } else if (is_str_eq(trans_cmd, "abort")) { - register_instance_refresh_timer(ctx, 0); ret = transaction_abort(&data, data.trans_id); + register_instance_refresh_timer(ctx, 100); blobmsg_add_u8(&data.bb, "status", (ret == 0)); } else if (is_str_eq(trans_cmd, "status")) { transaction_status(&data.bb);