From 6e46f6d116aeadbb341c933bdfbdd7dffe7a378f Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 15:32:14 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_roam_issue_ft_preauth_req() context param Currently csr_roam_issue_ft_preauth_req() takes a tHalHandle context param. However CSR is an internal module, and hence it should be using the "real" context pointer type tpAniSirGlobal instead of the opaque reference tHalhandle, so update the API. Change-Id: I7d521ba558a64c87af72a6ce2d27eae93d1a633d CRs-Fixed: 2255547 --- core/sme/inc/csr_api.h | 20 ++++++++++++++++---- core/sme/src/csr/csr_roam_preauth.c | 18 +++++------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 3451e3275826..0930ef0ce38e 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1723,12 +1723,24 @@ typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics, uint32_t staId, void *pContext); #endif /* FEATURE_WLAN_ESE */ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext); + +/** + * csr_roam_issue_ft_preauth_req() - Initiate Preauthentication request + * @max_ctx: Global MAC context + * @session_id: SME Session ID + * @bss_desc: BSS descriptor + * + * Return: Success or Failure + */ #ifdef WLAN_FEATURE_HOST_ROAM -QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, - tpSirBssDescription pBssDescription); +QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx, + uint32_t session_id, + tpSirBssDescription bss_desc); #else -static inline QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, - uint32_t sessionId, tpSirBssDescription pBssDescription) +static inline +QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx, + uint32_t session_id, + tpSirBssDescription bss_desc) { return QDF_STATUS_E_NOSUPPORT; } diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index 8fdce7373010..5e2a8923382e 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -527,18 +527,10 @@ uint32_t csr_get_dot11_mode(tHalHandle hal, uint32_t session_id, return dot11mode; } -/** - * csr_roam_issue_ft_preauth_req() - Initiate Preauthentication request - * @hal: Global Handle - * @session_id: SME Session ID - * @bss_desc: BSS descriptor - * - * Return: Success or Failure - */ -QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id, - tpSirBssDescription bss_desc) +QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx, + uint32_t session_id, + tpSirBssDescription bss_desc) { - tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); tpSirFTPreAuthReq preauth_req; uint16_t auth_req_len = 0; struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx, @@ -570,8 +562,8 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id, preauth_req->messageType = eWNI_SME_FT_PRE_AUTH_REQ; preauth_req->preAuthchannelNum = bss_desc->channelId; - preauth_req->dot11mode = - csr_get_dot11_mode(hal, session_id, bss_desc); + preauth_req->dot11mode = csr_get_dot11_mode(mac_ctx, session_id, + bss_desc); if (!preauth_req->dot11mode) { sme_err("preauth_req->dot11mode is zero"); qdf_mem_free(preauth_req);