samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace tHalHandle in sme_ft_api

Browse Source 
I9d0d7d109621237f29d66f7b06c5b63c38f63fb2 (qcacld-3.0: Introduce
mac_handle_t) introduced a "better" name for tHalHandle, so replace
tHalHandle with mac_handle_t in sme_ft_api.

Change-Id: I0d185e15611597d396c00f7e6f2c3d27472426c9
CRs-Fixed: 2348549
This commit is contained in:
Jeff Johnson
2018-11-07 14:52:25 -08:00
parent 0aaecf6b60
commit b98ee39c0a
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/sme/inc/sme_ft_api.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * Copyright (c) 2013-2016, 2018 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -73,21 +73,22 @@ typedef struct sFTSMEContext {
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
Prototype functions Prototype functions
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
void sme_ft_open(tHalHandle hHal, uint32_t sessionId); void sme_ft_open(mac_handle_t hHal, uint32_t sessionId);
void sme_ft_close(tHalHandle hHal, uint32_t sessionId); void sme_ft_close(mac_handle_t hHal, uint32_t sessionId);
void sme_ft_reset(tHalHandle hHal, uint32_t sessionId); void sme_ft_reset(mac_handle_t hHal, uint32_t sessionId);
void sme_set_ft_ies(tHalHandle hHal, uint32_t sessionId, const uint8_t *ft_ies, void sme_set_ft_ies(mac_handle_t hHal, uint32_t sessionId,
uint16_t ft_ies_length); const uint8_t *ft_ies, uint16_t ft_ies_length);
QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, QDF_STATUS sme_ft_update_key(mac_handle_t hHal, uint32_t sessionId,
tCsrRoamSetKey *pFTKeyInfo); tCsrRoamSetKey *pFTKeyInfo);
void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, void sme_get_ft_pre_auth_response(mac_handle_t hHal, uint32_t sessionId,
uint8_t *ft_ies, uint32_t ft_ies_ip_len, uint8_t *ft_ies, uint32_t ft_ies_ip_len,
uint16_t *ft_ies_length); uint16_t *ft_ies_length);
void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, void sme_get_rici_es(mac_handle_t hHal, uint32_t sessionId, uint8_t *ric_ies,
uint32_t ric_ies_ip_len, uint32_t *ric_ies_length); uint32_t ric_ies_ip_len, uint32_t *ric_ies_length);
void sme_preauth_reassoc_intvl_timer_callback(void *context); void sme_preauth_reassoc_intvl_timer_callback(void *context);
void sme_set_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId, bool state); void sme_set_ft_pre_auth_state(mac_handle_t hHal, uint32_t sessionId,
bool sme_get_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId); bool state);
bool sme_get_ftptk_state(tHalHandle hHal, uint32_t sessionId); bool sme_get_ft_pre_auth_state(mac_handle_t hHal, uint32_t sessionId);
void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state); bool sme_get_ftptk_state(mac_handle_t hHal, uint32_t sessionId);
void sme_set_ftptk_state(mac_handle_t hHal, uint32_t sessionId, bool state);
#endif #endif

25
core/sme/src/common/sme_ft_api.c
View File

@@ -23,7 +23,7 @@
#include <sir_api.h> #include <sir_api.h>
/* Initialize the FT context. */ /* Initialize the FT context. */
void sme_ft_open(tHalHandle hHal, uint32_t sessionId) void sme_ft_open(mac_handle_t hHal, uint32_t sessionId)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -58,7 +58,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId)
} }
/* Cleanup the SME FT Global context. */ /* Cleanup the SME FT Global context. */
void sme_ft_close(tHalHandle hHal, uint32_t sessionId) void sme_ft_close(mac_handle_t hHal, uint32_t sessionId)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = NULL; struct csr_roam_session *pSession = NULL;
@@ -86,7 +86,8 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId)
} }
} }
void sme_set_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId, bool state) void sme_set_ft_pre_auth_state(mac_handle_t hHal, uint32_t sessionId,
bool state)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -95,7 +96,7 @@ void sme_set_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId, bool state)
pSession->ftSmeContext.setFTPreAuthState = state; pSession->ftSmeContext.setFTPreAuthState = state;
} }
bool sme_get_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId) bool sme_get_ft_pre_auth_state(mac_handle_t hHal, uint32_t sessionId)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -118,8 +119,8 @@ bool sme_get_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId)
* *
* Return: none * Return: none
*/ */
void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, void sme_set_ft_ies(mac_handle_t hal_ptr, uint32_t session_id,
const uint8_t *ft_ies, uint16_t ft_ies_length) const uint8_t *ft_ies, uint16_t ft_ies_length)
{ {
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ptr); tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ptr);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -281,7 +282,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tpAniSirGlobal mac, uint32_t session_id,
return status; return status;
} }
bool sme_get_ftptk_state(tHalHandle hHal, uint32_t sessionId) bool sme_get_ftptk_state(mac_handle_t hHal, uint32_t sessionId)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -293,7 +294,7 @@ bool sme_get_ftptk_state(tHalHandle hHal, uint32_t sessionId)
return pSession->ftSmeContext.setFTPTKState; return pSession->ftSmeContext.setFTPTKState;
} }
void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state) void sme_set_ftptk_state(mac_handle_t hHal, uint32_t sessionId, bool state)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -305,7 +306,7 @@ void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state)
pSession->ftSmeContext.setFTPTKState = state; pSession->ftSmeContext.setFTPTKState = state;
} }
QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, QDF_STATUS sme_ft_update_key(mac_handle_t hHal, uint32_t sessionId,
tCsrRoamSetKey *pFTKeyInfo) tCsrRoamSetKey *pFTKeyInfo)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -367,7 +368,7 @@ QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId,
* supplicant. The supplicant will then proceed to send down the * supplicant. The supplicant will then proceed to send down the
* Reassoc Req. * Reassoc Req.
*/ */
void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, void sme_get_ft_pre_auth_response(mac_handle_t hHal, uint32_t sessionId,
uint8_t *ft_ies, uint32_t ft_ies_ip_len, uint8_t *ft_ies, uint32_t ft_ies_ip_len,
uint16_t *ft_ies_length) uint16_t *ft_ies_length)
{ {
@@ -417,7 +418,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId,
* The supplicant will then proceed to send down the * The supplicant will then proceed to send down the
* Reassoc Req. * Reassoc Req.
*/ */
void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, void sme_get_rici_es(mac_handle_t hHal, uint32_t sessionId, uint8_t *ric_ies,
uint32_t ric_ies_ip_len, uint32_t *ric_ies_length) uint32_t ric_ies_ip_len, uint32_t *ric_ies_length)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -470,7 +471,7 @@ void sme_preauth_reassoc_intvl_timer_callback(void *context)
} }
/* Reset the FT context. */ /* Reset the FT context. */
void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) void sme_ft_reset(mac_handle_t hHal, uint32_t sessionId)
{ {
tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct csr_roam_session *pSession = NULL; struct csr_roam_session *pSession = NULL;