From 2ef47449f6b22a86bc0078797d1193d34a75011a Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 9 Jun 2018 23:43:40 -0700 Subject: [PATCH] qcacld-3.0: Fix sme_unprotected_mgmt_frm_ind() context param Currently sme_unprotected_mgmt_frm_ind() takes a tHalHandle context param. However this is a static function, and hence it should be using the "real" context pointer type tpAniSirGlobal instead of the opaque reference tHalHandle, so update the API to expect tpAniSirGlobal. Change-Id: I552cade9adf0bdc7a9cf38c76cd8786548dc7011 CRs-Fixed: 2266505 --- core/sme/src/common/sme_api.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 456da4830821..9a16bf845121 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -69,11 +69,6 @@ static QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, static QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); -#ifdef WLAN_FEATURE_11W -QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, - tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm); -#endif - /* Channel Change Response Indication Handler */ static QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); @@ -1340,10 +1335,10 @@ static QDF_STATUS dfs_msg_processor(tpAniSirGlobal mac, * Handle the unprotected management frame indication from LIM and * forward it to HDD. */ -QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, - tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm) +static QDF_STATUS +sme_unprotected_mgmt_frm_ind(tpAniSirGlobal mac, + tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; struct csr_roam_info roam_info = { 0 }; uint32_t SessionId = pSmeMgmtFrm->sessionId; @@ -1353,7 +1348,7 @@ QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, roam_info.frameType = pSmeMgmtFrm->frameType; /* forward the mgmt frame to HDD */ - csr_roam_call_callback(pMac, SessionId, &roam_info, 0, + csr_roam_call_callback(mac, SessionId, &roam_info, 0, eCSR_ROAM_UNPROT_MGMT_FRAME_IND, 0); return status;