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
This commit is contained in:
Jeff Johnson 2018-06-03 15:32:14 -07:00
parent 639f6141eb
commit 6e46f6d116
2 changed files with 21 additions and 17 deletions

View File

@ -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;
}

View File

@ -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);