From aa5716f95f02a8355e2fca0bab748e9e9bd35abf Mon Sep 17 00:00:00 2001 From: Lincoln Tran Date: Tue, 19 May 2020 16:14:55 -0700 Subject: [PATCH] qcacld-3.0: Update nan_discovery_flush_callback Update return type of nan_discovery_flush_callback to return QDF_STATUS to match scheduler_msg_process_fn_t. Change-Id: I3a2c32beaff471ed3a2e8e3956292257e074cd50 CRs-fixed: 2698305 --- components/nan/core/src/nan_main.c | 8 +++++--- components/nan/core/src/nan_main_i.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/nan/core/src/nan_main.c b/components/nan/core/src/nan_main.c index 9687f83c5c..c73c4383ab 100644 --- a/components/nan/core/src/nan_main.c +++ b/components/nan/core/src/nan_main.c @@ -1259,13 +1259,13 @@ static QDF_STATUS nan_discovery_generic_req(struct nan_generic_req *req) return tx_ops->nan_discovery_req_tx(req, NAN_GENERIC_REQ); } -void nan_discovery_flush_callback(struct scheduler_msg *msg) +QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg) { struct wlan_objmgr_psoc *psoc; if (!msg || !msg->bodyptr) { nan_err("Null pointer for NAN Discovery message"); - return; + return QDF_STATUS_E_INVAL; } switch (msg->type) { @@ -1281,11 +1281,13 @@ void nan_discovery_flush_callback(struct scheduler_msg *msg) default: nan_err("Unsupported request type: %d", msg->type); qdf_mem_free(msg->bodyptr); - return; + return QDF_STATUS_E_INVAL; } wlan_objmgr_psoc_release_ref(psoc, WLAN_NAN_ID); qdf_mem_free(msg->bodyptr); + + return QDF_STATUS_SUCCESS; } QDF_STATUS nan_discovery_scheduled_handler(struct scheduler_msg *msg) diff --git a/components/nan/core/src/nan_main_i.h b/components/nan/core/src/nan_main_i.h index 07fc44532e..b133eb54cc 100644 --- a/components/nan/core/src/nan_main_i.h +++ b/components/nan/core/src/nan_main_i.h @@ -186,9 +186,9 @@ QDF_STATUS nan_scheduled_msg_handler(struct scheduler_msg *msg); * nan_discovery_flush_callback: callback to flush the NAN scheduler msg * @msg: pointer to msg * - * Return: None + * Return: QDF_STATUS */ -void nan_discovery_flush_callback(struct scheduler_msg *msg); +QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg); /** * nan_discovery_scheduled_handler: callback pointer to be called when scheduler