From 6f99fb8796e12bd9fa1ce6540f244c1bc835a7eb Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 4 Jan 2013 18:20:22 +0200 Subject: [PATCH] Revert "core: Add index parameter to mgmt_request_func_t callback" This reverts commit c2c64bf32218b389c856ec0142c66b4cdfc6a689. The extra index parameter isn't that useful after all. --- src/shared/mgmt.c | 3 +-- src/shared/mgmt.h | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/shared/mgmt.c b/src/shared/mgmt.c index 411e499e5..de63ae74b 100644 --- a/src/shared/mgmt.c +++ b/src/shared/mgmt.c @@ -200,8 +200,7 @@ static void request_complete(struct mgmt *mgmt, uint8_t status, mgmt->pending_list = g_list_delete_link(mgmt->pending_list, list); if (request->callback) - request->callback(index, status, length, param, - request->user_data); + request->callback(status, length, param, request->user_data); destroy_request(request, NULL); diff --git a/src/shared/mgmt.h b/src/shared/mgmt.h index 37ee8949b..a43de1011 100644 --- a/src/shared/mgmt.h +++ b/src/shared/mgmt.h @@ -41,9 +41,8 @@ bool mgmt_set_debug(struct mgmt *mgmt, mgmt_debug_func_t callback, bool mgmt_set_close_on_unref(struct mgmt *mgmt, bool do_close); -typedef void (*mgmt_request_func_t)(uint16_t index, uint8_t status, - uint16_t length, const void *param, - void *user_data); +typedef void (*mgmt_request_func_t)(uint8_t status, uint16_t length, + const void *param, void *user_data); unsigned int mgmt_send(struct mgmt *mgmt, uint16_t opcode, uint16_t index, uint16_t length, const void *param, -- 2.47.3