From 5d61580222be79a5683d4f43bbe6b620f3c8cd5c Mon Sep 17 00:00:00 2001 From: Rakesh Sunki Date: Tue, 2 Aug 2016 17:16:36 -0700 Subject: qcacld-2.0: Fix NAN APIs when NAN data path feature is disabled Add NAN API wrapper function definitions when NAN data path feature is disabled. Change-Id: Ib4a3133568eee0c2257c65bb0a8905c44048f0c2 CRs-Fixed: 1049546 --- CORE/SME/inc/sme_nan_datapath.h | 26 ++++++++++++++++++-------- CORE/SME/src/nan/nan_datapath_api.c | 13 ------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/CORE/SME/inc/sme_nan_datapath.h b/CORE/SME/inc/sme_nan_datapath.h index 43681c8250b7..1216789ffc34 100644 --- a/CORE/SME/inc/sme_nan_datapath.h +++ b/CORE/SME/inc/sme_nan_datapath.h @@ -87,14 +87,6 @@ eHalStatus sme_ndp_responder_req_handler(tHalHandle hal, /* NaN indication response handler */ VOS_STATUS sme_ndp_end_req_handler(tHalHandle hal, struct ndp_end_req *req); -/* NaN schedule update request handler */ -VOS_STATUS sme_ndp_sched_req_handler(uint32_t session_id, - struct ndp_schedule_update_req *req_params); - -/* Function to handle NDP messages from lower layers */ -void sme_ndp_message_processor(tpAniSirGlobal mac_ctx, uint16_t msg_type, - void *msg); - /* Start NDI BSS */ VOS_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id, tCsrRoamProfile *profile); @@ -125,6 +117,24 @@ void csr_release_ndp_data_end_req(tpAniSirGlobal mac_ctx, tSmeCmd *cmd); #else +/* NAN initiator request handler */ +static inline eHalStatus sme_ndp_initiator_req_handler(tHalHandle hal, + void *req_params) { + return eHAL_STATUS_SUCCESS; +} + + +/* NAN responder request handler */ +static inline eHalStatus sme_ndp_responder_req_handler(tHalHandle hal, + void *req_params) { + return eHAL_STATUS_SUCCESS; +} + +/* NAN indication response handler */ +static inline VOS_STATUS sme_ndp_end_req_handler(tHalHandle hal, void *req) { + return VOS_STATUS_SUCCESS; +} + /* Start NDI BSS */ static inline VOS_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id, diff --git a/CORE/SME/src/nan/nan_datapath_api.c b/CORE/SME/src/nan/nan_datapath_api.c index 2a28d1a30260..2f0af8f65bf0 100644 --- a/CORE/SME/src/nan/nan_datapath_api.c +++ b/CORE/SME/src/nan/nan_datapath_api.c @@ -248,19 +248,6 @@ VOS_STATUS sme_ndp_end_req_handler(tHalHandle hal, struct ndp_end_req *req) return ret; } -/** - * sme_ndp_sched_req_handler() - ndp schedule request handler - * @session_id: session id over which the ndp is being created - * @req_params: request parameters - * - * Return: VOS_STATUS_SUCCESS on success; error number otherwise - */ -VOS_STATUS sme_ndp_sched_req_handler(uint32_t session_id, - struct ndp_schedule_update_req *req_params) -{ - return VOS_STATUS_SUCCESS; -} - /** * csr_roam_start_ndi() - Start connection for NaN data path * @mac_ctx: Global MAC context -- cgit v1.2.3