qcacld-3.0: Rename pMac in misc LIM files

Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged." One identifier
used extensively throughout the driver that violates both of these
tenants is "pMac." In order to be compliant with the Linux coding
style there is a campaign to rename all instances of this identifier.

For this change rename all instances of "pMac" to "mac" in:
lim_admit_control.c
lim_admit_control.h
lim_aid_mgmt.c
lim_link_monitoring_algo.c
lim_process_action_frame.c
lim_process_assoc_rsp_frame.c
lim_process_auth_frame.c
lim_process_cfg_updates.c
lim_process_deauth_frame.c
lim_process_disassoc_frame.c
lim_process_mlm_host_roam.c
lim_process_probe_req_frame.c
lim_prop_exts_utils.c
lim_prop_exts_utils.h
lim_reassoc_utils.c
lim_scan_result_utils.c
lim_scan_result_utils.h
lim_send_frames_host_roam.c
lim_ser_des_utils.c
lim_ser_des_utils.h
lim_session.c
lim_session.h
lim_session_utils.h
lim_sme_req_utils.c
lim_sta_hash_api.c
lim_sta_hash_api.h
lim_trace.c
lim_trace.h
lim_types.h

Change-Id: I64638afc1b6805310e7588f972d19e330deb9ff3
CRs-Fixed: 2355461
This commit is contained in:
Jeff Johnson 2018-11-22 16:51:12 -08:00 • committed by nshrivas
commit 348973e7a4
29 changed files with 589 additions and 589 deletions

View file

@ -39,14 +39,14 @@ lim_tspec_find_by_assoc_id(tpAniSirGlobal, uint16_t, tSirMacTspecIE *,
tpLimTspecInfo, tpLimTspecInfo *);
/* Add TSPEC in lim local table */
QDF_STATUS lim_tspec_add(tpAniSirGlobal pMac,
QDF_STATUS lim_tspec_add(tpAniSirGlobal mac,
uint8_t *pAddr,
uint16_t assocId,
tSirMacTspecIE *pTspec,
uint32_t interval, tpLimTspecInfo *ppInfo);
/* admit control interface */
extern QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac,
extern QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac,
uint8_t *pAddr, tSirAddtsReqInfo *addts,
tSirMacQosCapabilityStaIE *qos,
uint16_t assocId, uint8_t alloc,
@ -56,41 +56,41 @@ extern QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac,
tpPESession psessionEntry);
static inline QDF_STATUS
lim_admit_control_add_sta(tpAniSirGlobal pMac, uint8_t *staAddr, uint8_t alloc)
lim_admit_control_add_sta(tpAniSirGlobal mac, uint8_t *staAddr, uint8_t alloc)
{
return QDF_STATUS_SUCCESS;
}
extern QDF_STATUS
lim_admit_control_delete_sta(tpAniSirGlobal pMac, uint16_t assocId);
lim_admit_control_delete_sta(tpAniSirGlobal mac, uint16_t assocId);
extern QDF_STATUS
lim_admit_control_delete_ts(tpAniSirGlobal pMac,
lim_admit_control_delete_ts(tpAniSirGlobal mac,
uint16_t assocId,
tSirMacTSInfo *tsinfo,
uint8_t *tsStatus, uint8_t *tspecIdx);
QDF_STATUS lim_admit_control_init(tpAniSirGlobal pMac);
QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac);
#ifdef FEATURE_WLAN_ESE
QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx,
tSirMacTspecIE tspecIE,
uint8_t sessionId, uint16_t tsm_interval);
#else
QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx,
tSirMacTspecIE tspecIE,
uint8_t sessionId);
#endif
QDF_STATUS lim_send_hal_msg_del_ts(tpAniSirGlobal pMac,
QDF_STATUS lim_send_hal_msg_del_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx,
tSirDeltsReqInfo delts,
uint8_t sessionId, uint8_t *bssId);
void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
void lim_process_hal_add_ts_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsg);
#endif

View file

@ -604,7 +604,7 @@ static inline void pe_free_dph_node_array_buffer(void)
/**
* pe_create_session() - Creates a new PE session given the BSSID
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @bssid: BSSID of the new session
* @sessionId: PE session ID is returned here, if PE session is created.
* @numSta: number of stations
@ -616,7 +616,7 @@ static inline void pe_free_dph_node_array_buffer(void)
*
* Return: ptr to the session context or NULL if session can not be created.
*/
tpPESession pe_create_session(tpAniSirGlobal pMac,
tpPESession pe_create_session(tpAniSirGlobal mac,
uint8_t *bssid,
uint8_t *sessionId,
uint16_t numSta, tSirBssType bssType,
@ -625,7 +625,7 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
/**
* pe_find_session_by_bssid() - looks up the PE session given the BSSID.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @bssid: BSSID of the new session
* @sessionId: session ID is returned here, if session is created.
*
@ -634,13 +634,13 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
*
* Return: pointer to the session context or NULL if session is not found.
*/
tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid,
tpPESession pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
uint8_t *sessionId);
/**
* pe_find_session_by_bss_idx() - looks up the PE session given the bssIdx.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @bssIdx: bss index of the session
*
* This function returns the session context if the session
@ -648,13 +648,13 @@ tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid,
*
* Return: pointer to the session context or NULL if session is not found.
*/
tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal pMac, uint8_t bssIdx);
tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx);
/**
* pe_find_session_by_peer_sta() - looks up the PE session given the Peer
* Station Address.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @sa: Peer STA Address of the session
* @sessionId: session ID is returned here, if session is found.
*
@ -664,14 +664,14 @@ tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal pMac, uint8_t bssIdx);
*
* Return: pointer to the session context or NULL if session is not found.
*/
tpPESession pe_find_session_by_peer_sta(tpAniSirGlobal pMac, uint8_t *sa,
tpPESession pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
uint8_t *sessionId);
/**
* pe_find_session_by_session_id() - looks up the PE session given the session
* ID.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @sessionId: session ID for which session context needs to be looked up.
*
* This function returns the session context if the session corresponding to
@ -679,13 +679,13 @@ tpPESession pe_find_session_by_peer_sta(tpAniSirGlobal pMac, uint8_t *sa,
*
* Return: pointer to the session context or NULL if session is not found.
*/
tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac,
tpPESession pe_find_session_by_session_id(tpAniSirGlobal mac,
uint8_t sessionId);
/**
* pe_find_session_by_bssid() - looks up the PE session given staid.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @staid: StaId of the session
* @sessionId: session ID is returned here, if session is found.
*
@ -694,18 +694,18 @@ tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac,
*
* Return: pointer to the session context or NULL if session is not found.
*/
tpPESession pe_find_session_by_sta_id(tpAniSirGlobal pMac, uint8_t staid,
tpPESession pe_find_session_by_sta_id(tpAniSirGlobal mac, uint8_t staid,
uint8_t *sessionId);
/**
* pe_delete_session() - deletes the PE session given the session ID.
*
* @pMac: pointer to global adapter context
* @mac: pointer to global adapter context
* @sessionId: session ID to delete.
*
* Return: void
*/
void pe_delete_session(tpAniSirGlobal pMac, tpPESession psessionEntry);
void pe_delete_session(tpAniSirGlobal mac, tpPESession psessionEntry);
/**

View file

@ -70,20 +70,20 @@ enum {
TRACE_CODE_INFO_LOG
};
void lim_trace_init(tpAniSirGlobal pMac);
void limTraceReset(tpAniSirGlobal pMac);
void limTraceUpdateMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
void lim_trace_dumpMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
void lim_trace_init(tpAniSirGlobal mac);
void limTraceReset(tpAniSirGlobal mac);
void limTraceUpdateMgmtStat(tpAniSirGlobal mac, uint8_t subtype);
void lim_trace_dumpMgmtStat(tpAniSirGlobal mac, uint8_t subtype);
uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
void lim_trace_dump(void *pMac, tp_qdf_trace_record pRecord,
void lim_trace_dump(void *mac, tp_qdf_trace_record pRecord,
uint16_t recIndex);
void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
void mac_trace_msg_tx(tpAniSirGlobal mac, uint8_t session, uint32_t data);
void mac_trace_msg_rx(tpAniSirGlobal mac, uint8_t session, uint32_t data);
void mac_trace_msg_rx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
void mac_trace_msg_rx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
uint32_t data);
void mac_trace_msg_tx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
void mac_trace_msg_tx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
uint32_t data);
#endif /* endof LIM_TRACE_RECORD MACRO */

View file

@ -87,7 +87,7 @@ static QDF_STATUS lim_validate_access_policy(tpAniSirGlobal, uint8_t, uint16_t,
-------------------------------------------------------------*/
static QDF_STATUS
lim_calculate_svc_int(tpAniSirGlobal pMac,
lim_calculate_svc_int(tpAniSirGlobal mac,
tSirMacTspecIE *pTspec, uint32_t *pSvcInt)
{
uint32_t msduSz, dataRate;
@ -180,14 +180,14 @@ lim_validate_tspec_edca(tpAniSirGlobal mac_ctx,
-------------------------------------------------------------*/
static QDF_STATUS
lim_validate_tspec(tpAniSirGlobal pMac,
lim_validate_tspec(tpAniSirGlobal mac,
tSirMacTspecIE *pTspec, tpPESession psessionEntry)
{
QDF_STATUS retval = QDF_STATUS_SUCCESS;
switch (pTspec->tsinfo.traffic.accessPolicy) {
case SIR_MAC_ACCESSPOLICY_EDCA:
retval = lim_validate_tspec_edca(pMac, pTspec, psessionEntry);
retval = lim_validate_tspec_edca(mac, pTspec, psessionEntry);
if (retval != QDF_STATUS_SUCCESS)
pe_warn("EDCA tspec invalid");
break;
@ -218,7 +218,7 @@ lim_validate_tspec(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
static void
lim_compute_mean_bw_used(tpAniSirGlobal pMac,
lim_compute_mean_bw_used(tpAniSirGlobal mac,
uint32_t *pBw,
uint32_t phyMode,
tpLimTspecInfo pTspecInfo, tpPESession psessionEntry)
@ -228,7 +228,7 @@ lim_compute_mean_bw_used(tpAniSirGlobal pMac,
for (ctspec = 0; ctspec < LIM_NUM_TSPEC_MAX; ctspec++, pTspecInfo++) {
if (pTspecInfo->inuse) {
tpDphHashNode pSta =
dph_get_hash_entry(pMac, pTspecInfo->assocId,
dph_get_hash_entry(mac, pTspecInfo->assocId,
&psessionEntry->dph.dphHashTable);
if (pSta == NULL) {
/* maybe we should delete the tspec?? */
@ -254,7 +254,7 @@ lim_compute_mean_bw_used(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
static void
lim_get_available_bw(tpAniSirGlobal pMac,
lim_get_available_bw(tpAniSirGlobal mac,
uint32_t *pMaxBw,
uint32_t *pMinBw, uint32_t phyMode, uint32_t bw_factor)
{
@ -333,12 +333,12 @@ lim_admit_policy_oversubscription(tpAniSirGlobal mac_ctx,
\return QDF_STATUS - status
-------------------------------------------------------------*/
static QDF_STATUS lim_admit_policy(tpAniSirGlobal pMac,
static QDF_STATUS lim_admit_policy(tpAniSirGlobal mac,
tSirMacTspecIE *pTspec,
tpPESession psessionEntry)
{
QDF_STATUS retval = QDF_STATUS_E_FAILURE;
tpLimAdmitPolicyInfo pAdmitPolicy = &pMac->lim.admitPolicyInfo;
tpLimAdmitPolicyInfo pAdmitPolicy = &mac->lim.admitPolicyInfo;
switch (pAdmitPolicy->type) {
case WNI_CFG_ADMIT_POLICY_ADMIT_ALL:
@ -346,10 +346,10 @@ static QDF_STATUS lim_admit_policy(tpAniSirGlobal pMac,
break;
case WNI_CFG_ADMIT_POLICY_BW_FACTOR:
retval = lim_admit_policy_oversubscription(pMac, pTspec,
&pMac->lim.
retval = lim_admit_policy_oversubscription(mac, pTspec,
&mac->lim.
admitPolicyInfo,
&pMac->lim.tspecInfo[0],
&mac->lim.tspecInfo[0],
psessionEntry);
if (retval != QDF_STATUS_SUCCESS)
pe_err("rejected by BWFactor policy");
@ -378,7 +378,7 @@ static QDF_STATUS lim_admit_policy(tpAniSirGlobal pMac,
/* ----------------------------------------------------------------------------- */
/* delete the specified tspec */
static void lim_tspec_delete(tpAniSirGlobal pMac, tpLimTspecInfo pInfo)
static void lim_tspec_delete(tpAniSirGlobal mac, tpLimTspecInfo pInfo)
{
if (pInfo == NULL)
return;
@ -402,7 +402,7 @@ static void lim_tspec_delete(tpAniSirGlobal pMac, tpLimTspecInfo pInfo)
/* find the specified tspec in the list */
static QDF_STATUS
lim_tspec_find_by_sta_addr(tpAniSirGlobal pMac,
lim_tspec_find_by_sta_addr(tpAniSirGlobal mac,
uint8_t *pAddr,
tSirMacTspecIE *pTspecIE,
tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@ -439,7 +439,7 @@ lim_tspec_find_by_sta_addr(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
QDF_STATUS
lim_tspec_find_by_assoc_id(tpAniSirGlobal pMac,
lim_tspec_find_by_assoc_id(tpAniSirGlobal mac,
uint16_t assocId,
tSirMacTspecIE *pTspecIE,
tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@ -478,7 +478,7 @@ lim_tspec_find_by_assoc_id(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
static QDF_STATUS
lim_find_tspec(tpAniSirGlobal pMac,
lim_find_tspec(tpAniSirGlobal mac,
uint16_t assocId,
tSirMacTSInfo *pTsInfo,
tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@ -517,17 +517,17 @@ lim_find_tspec(tpAniSirGlobal pMac,
\return QDF_STATUS - status of the comparison
-------------------------------------------------------------*/
QDF_STATUS lim_tspec_add(tpAniSirGlobal pMac,
QDF_STATUS lim_tspec_add(tpAniSirGlobal mac,
uint8_t *pAddr,
uint16_t assocId,
tSirMacTspecIE *pTspec,
uint32_t interval, tpLimTspecInfo *ppInfo)
{
tpLimTspecInfo pTspecList = &pMac->lim.tspecInfo[0];
tpLimTspecInfo pTspecList = &mac->lim.tspecInfo[0];
*ppInfo = NULL;
/* validate the assocId */
if (assocId >= pMac->lim.maxStation) {
if (assocId >= mac->lim.maxStation) {
pe_err("Invalid assocId 0x%x", assocId);
return QDF_STATUS_E_FAILURE;
}
@ -536,7 +536,7 @@ QDF_STATUS lim_tspec_add(tpAniSirGlobal pMac,
*ppInfo = NULL;
if (QDF_STATUS_SUCCESS ==
lim_find_tspec(pMac, assocId, &pTspec->tsinfo, pTspecList,
lim_find_tspec(mac, assocId, &pTspec->tsinfo, pTspecList,
ppInfo)) {
/* update this entry. */
pe_debug("updating TSPEC table entry: %d",
@ -547,7 +547,7 @@ QDF_STATUS lim_tspec_add(tpAniSirGlobal pMac,
*/
uint8_t ctspec = 0;
for (ctspec = 0, pTspecList = &pMac->lim.tspecInfo[0];
for (ctspec = 0, pTspecList = &mac->lim.tspecInfo[0];
ctspec < LIM_NUM_TSPEC_MAX;
ctspec++, pTspecList++) {
if (!pTspecList->inuse) {
@ -603,13 +603,13 @@ QDF_STATUS lim_tspec_add(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
static QDF_STATUS
lim_validate_access_policy(tpAniSirGlobal pMac,
lim_validate_access_policy(tpAniSirGlobal mac,
uint8_t accessPolicy,
uint16_t assocId, tpPESession psessionEntry)
{
QDF_STATUS retval = QDF_STATUS_E_FAILURE;
tpDphHashNode pSta =
dph_get_hash_entry(pMac, assocId, &psessionEntry->dph.dphHashTable);
dph_get_hash_entry(mac, assocId, &psessionEntry->dph.dphHashTable);
if ((pSta == NULL) || (!pSta->valid)) {
pe_err("invalid station address passed");
@ -640,7 +640,7 @@ lim_validate_access_policy(tpAniSirGlobal pMac,
/**
* lim_admit_control_add_ts() - Check if STA can be admitted
* @pMac: Global MAC context
* @mac: Global MAC context
* @pAddr: Address
* @pAddts: ADD TS
* @pQos: QOS fields
@ -655,7 +655,7 @@ lim_validate_access_policy(tpAniSirGlobal pMac,
*
* Return: status
**/
QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr,
QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac, uint8_t *pAddr,
tSirAddtsReqInfo *pAddts, tSirMacQosCapabilityStaIE *pQos,
uint16_t assocId, uint8_t alloc, tSirMacScheduleIE *pSch,
uint8_t *pTspecIdx, tpPESession psessionEntry)
@ -678,29 +678,29 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr,
/* check for duplicate tspec */
retval = (alloc)
? lim_tspec_find_by_assoc_id(pMac, assocId, &pAddts->tspec,
&pMac->lim.tspecInfo[0], &pTspecInfo)
: lim_tspec_find_by_sta_addr(pMac, pAddr, &pAddts->tspec,
&pMac->lim.tspecInfo[0], &pTspecInfo);
? lim_tspec_find_by_assoc_id(mac, assocId, &pAddts->tspec,
&mac->lim.tspecInfo[0], &pTspecInfo)
: lim_tspec_find_by_sta_addr(mac, pAddr, &pAddts->tspec,
&mac->lim.tspecInfo[0], &pTspecInfo);
if (retval == QDF_STATUS_SUCCESS) {
pe_err("duplicate tspec index: %d", pTspecInfo->idx);
return QDF_STATUS_E_FAILURE;
}
/* check that the tspec's are well formed and acceptable */
if (lim_validate_tspec(pMac, &pAddts->tspec, psessionEntry) !=
if (lim_validate_tspec(mac, &pAddts->tspec, psessionEntry) !=
QDF_STATUS_SUCCESS) {
pe_warn("tspec validation failed");
return QDF_STATUS_E_FAILURE;
}
/* determine a service interval for the tspec */
if (lim_calculate_svc_int(pMac, &pAddts->tspec, &svcInterval) !=
if (lim_calculate_svc_int(mac, &pAddts->tspec, &svcInterval) !=
QDF_STATUS_SUCCESS) {
pe_warn("SvcInt calculate failed");
return QDF_STATUS_E_FAILURE;
}
/* determine if the tspec can be admitted or not based on current policy */
if (lim_admit_policy(pMac, &pAddts->tspec, psessionEntry) != QDF_STATUS_SUCCESS) {
if (lim_admit_policy(mac, &pAddts->tspec, psessionEntry) != QDF_STATUS_SUCCESS) {
pe_warn("tspec rejected by admit control policy");
return QDF_STATUS_E_FAILURE;
}
@ -722,7 +722,7 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr,
/* check that we are in the proper mode to deal with the tspec type */
if (lim_validate_access_policy
(pMac, (uint8_t) pAddts->tspec.tsinfo.traffic.accessPolicy, assocId,
(mac, (uint8_t) pAddts->tspec.tsinfo.traffic.accessPolicy, assocId,
psessionEntry) != QDF_STATUS_SUCCESS) {
pe_warn("AccessPolicy: %d is not valid in current mode",
pAddts->tspec.tsinfo.traffic.accessPolicy);
@ -730,7 +730,7 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr,
}
/* add tspec to list */
if (lim_tspec_add
(pMac, pAddr, assocId, &pAddts->tspec, svcInterval, &pTspecInfo)
(mac, pAddr, assocId, &pAddts->tspec, svcInterval, &pTspecInfo)
!= QDF_STATUS_SUCCESS) {
pe_err("no space in tspec list");
return QDF_STATUS_E_FAILURE;
@ -753,7 +753,7 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr,
-------------------------------------------------------------*/
QDF_STATUS
lim_admit_control_delete_ts(tpAniSirGlobal pMac,
lim_admit_control_delete_ts(tpAniSirGlobal mac,
uint16_t assocId,
tSirMacTSInfo *pTsInfo,
uint8_t *pTsStatus, uint8_t *ptspecIdx)
@ -764,13 +764,13 @@ lim_admit_control_delete_ts(tpAniSirGlobal pMac,
*pTsStatus = 0;
if (lim_find_tspec
(pMac, assocId, pTsInfo, &pMac->lim.tspecInfo[0],
(mac, assocId, pTsInfo, &mac->lim.tspecInfo[0],
&pTspecInfo) == QDF_STATUS_SUCCESS) {
if (pTspecInfo != NULL) {
pe_debug("Tspec entry: %d found", pTspecInfo->idx);
*ptspecIdx = pTspecInfo->idx;
lim_tspec_delete(pMac, pTspecInfo);
lim_tspec_delete(mac, pTspecInfo);
return QDF_STATUS_SUCCESS;
}
}
@ -785,14 +785,14 @@ lim_admit_control_delete_ts(tpAniSirGlobal pMac,
\return QDF_STATUS - status
-------------------------------------------------------------*/
QDF_STATUS lim_admit_control_delete_sta(tpAniSirGlobal pMac, uint16_t assocId)
QDF_STATUS lim_admit_control_delete_sta(tpAniSirGlobal mac, uint16_t assocId)
{
tpLimTspecInfo pTspecInfo = &pMac->lim.tspecInfo[0];
tpLimTspecInfo pTspecInfo = &mac->lim.tspecInfo[0];
int ctspec;
for (ctspec = 0; ctspec < LIM_NUM_TSPEC_MAX; ctspec++, pTspecInfo++) {
if (assocId == pTspecInfo->assocId) {
lim_tspec_delete(pMac, pTspecInfo);
lim_tspec_delete(mac, pTspecInfo);
pe_debug("Deleting TSPEC: %d for assocId: %d", ctspec,
assocId);
}
@ -808,9 +808,9 @@ QDF_STATUS lim_admit_control_delete_sta(tpAniSirGlobal pMac, uint16_t assocId)
\param tpAniSirGlobal pMac
\return QDF_STATUS - status
-------------------------------------------------------------*/
QDF_STATUS lim_admit_control_init(tpAniSirGlobal pMac)
QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac)
{
qdf_mem_set(pMac->lim.tspecInfo,
qdf_mem_set(mac->lim.tspecInfo,
LIM_NUM_TSPEC_MAX * sizeof(tLimTspecInfo), 0);
return QDF_STATUS_SUCCESS;
}
@ -829,14 +829,14 @@ QDF_STATUS lim_admit_control_init(tpAniSirGlobal pMac)
-------------------------------------------------------------*/
#ifdef FEATURE_WLAN_ESE
QDF_STATUS
lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx,
tSirMacTspecIE tspecIE,
uint8_t sessionId, uint16_t tsm_interval)
#else
QDF_STATUS
lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx, tSirMacTspecIE tspecIE, uint8_t sessionId)
#endif
@ -844,7 +844,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
struct scheduler_msg msg = {0};
tpAddTsParams pAddTsParam;
tpPESession psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
tpPESession psessionEntry = pe_find_session_by_session_id(mac, sessionId);
if (psessionEntry == NULL) {
pe_err("Unable to get Session for session Id: %d",
@ -866,7 +866,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
pAddTsParam->tsm_interval = tsm_interval;
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (pMac->mlme_cfg->lfr.lfr3_roaming_offload &&
if (mac->mlme_cfg->lfr.lfr3_roaming_offload &&
psessionEntry->is11Rconnection)
pAddTsParam->setRICparams = 1;
#endif
@ -878,12 +878,12 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
/* We need to defer any incoming messages until we get a
* WMA_ADD_TS_RSP from HAL.
*/
SET_LIM_PROCESS_DEFD_MESGS(pMac, false);
MTRACE(mac_trace_msg_tx(pMac, sessionId, msg.type));
SET_LIM_PROCESS_DEFD_MESGS(mac, false);
MTRACE(mac_trace_msg_tx(mac, sessionId, msg.type));
if (QDF_STATUS_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) {
if (QDF_STATUS_SUCCESS != wma_post_ctrl_msg(mac, &msg)) {
pe_warn("wma_post_ctrl_msg() failed");
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
SET_LIM_PROCESS_DEFD_MESGS(mac, true);
qdf_mem_free(pAddTsParam);
return QDF_STATUS_E_FAILURE;
}
@ -901,7 +901,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
-------------------------------------------------------------*/
QDF_STATUS
lim_send_hal_msg_del_ts(tpAniSirGlobal pMac,
lim_send_hal_msg_del_ts(tpAniSirGlobal mac,
uint16_t staIdx,
uint8_t tspecIdx,
tSirDeltsReqInfo delts, uint8_t sessionId, uint8_t *bssId)
@ -923,7 +923,7 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac,
pDelTsParam->tspecIdx = tspecIdx;
qdf_mem_copy(&pDelTsParam->bssId, bssId, sizeof(tSirMacAddr));
psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
psessionEntry = pe_find_session_by_session_id(mac, sessionId);
if (psessionEntry == NULL) {
pe_err("Session does Not exist with given sessionId: %d",
sessionId);
@ -935,16 +935,16 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac,
delts.tsinfo.traffic.userPrio;
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (pMac->mlme_cfg->lfr.lfr3_roaming_offload &&
if (mac->mlme_cfg->lfr.lfr3_roaming_offload &&
psessionEntry->is11Rconnection) {
qdf_mem_copy(&pDelTsParam->delTsInfo, &delts,
sizeof(tSirDeltsReqInfo));
pDelTsParam->setRICparams = 1;
}
#endif
MTRACE(mac_trace_msg_tx(pMac, sessionId, msg.type));
MTRACE(mac_trace_msg_tx(mac, sessionId, msg.type));
if (QDF_STATUS_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) {
if (QDF_STATUS_SUCCESS != wma_post_ctrl_msg(mac, &msg)) {
pe_warn("wma_post_ctrl_msg() failed");
goto err;
}
@ -965,7 +965,7 @@ err:
\param tpAniSirGlobal pMac
\param struct scheduler_msg *limMsg
-------------------------------------------------------------*/
void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
void lim_process_hal_add_ts_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsg)
{
tpAddTsParams pAddTsRspMsg = NULL;
@ -978,7 +978,7 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
/* Need to process all the deferred messages enqueued
* since sending the WMA_ADD_TS_REQ.
*/
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
SET_LIM_PROCESS_DEFD_MESGS(mac, true);
if (NULL == limMsg->bodyptr) {
pe_err("Received WMA_ADD_TS_RSP with NULL");
@ -989,22 +989,22 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
/* 090803: Use pe_find_session_by_session_id() to obtain the PE session context */
/* from the sessionId in the Rsp Msg from HAL */
psessionEntry = pe_find_session_by_session_id(pMac, pAddTsRspMsg->sessionId);
psessionEntry = pe_find_session_by_session_id(mac, pAddTsRspMsg->sessionId);
if (psessionEntry == NULL) {
pe_err("Session does Not exist with given sessionId: %d",
pAddTsRspMsg->sessionId);
lim_send_sme_addts_rsp(pMac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
psessionEntry, pAddTsRspMsg->tspec,
pMac->lim.gLimAddtsReq.sessionId,
pMac->lim.gLimAddtsReq.transactionId);
mac->lim.gLimAddtsReq.sessionId,
mac->lim.gLimAddtsReq.transactionId);
goto end;
}
if (pAddTsRspMsg->status == QDF_STATUS_SUCCESS) {
pe_debug("Received successful ADDTS response from HAL");
/* Use the smesessionId and smetransactionId from the PE session context */
lim_send_sme_addts_rsp(pMac, rspReqd, eSIR_SME_SUCCESS,
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_SUCCESS,
psessionEntry, pAddTsRspMsg->tspec,
psessionEntry->smeSessionId,
psessionEntry->transactionId);
@ -1016,16 +1016,16 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
sir_copy_mac_addr(peerMacAddr, psessionEntry->bssId);
/* 090803: Add the SME Session ID */
lim_send_delts_req_action_frame(pMac, peerMacAddr, rspReqd,
lim_send_delts_req_action_frame(mac, peerMacAddr, rspReqd,
&pAddTsRspMsg->tspec.tsinfo,
&pAddTsRspMsg->tspec, psessionEntry);
/* Delete TSPEC */
/* 090803: Pull the hash table from the session */
pSta = dph_lookup_assoc_id(pMac, pAddTsRspMsg->staIdx, &assocId,
pSta = dph_lookup_assoc_id(mac, pAddTsRspMsg->staIdx, &assocId,
&psessionEntry->dph.dphHashTable);
if (pSta != NULL)
lim_admit_control_delete_ts(pMac, assocId,
lim_admit_control_delete_ts(mac, assocId,
&pAddTsRspMsg->tspec.tsinfo,
NULL,
(uint8_t *) &pAddTsRspMsg->
@ -1033,7 +1033,7 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac,
/* Send SME_ADDTS_RSP */
/* 090803: Use the smesessionId and smetransactionId from the PE session context */
lim_send_sme_addts_rsp(pMac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
psessionEntry, pAddTsRspMsg->tspec,
psessionEntry->smeSessionId,
psessionEntry->transactionId);

View file

@ -42,7 +42,7 @@
/**
* lim_init_peer_idxpool() -- initializes peer index pool
* @pMac: mac context
* @mac: mac context
* @pSessionEntry: session entry
*
* This function is called while starting a BSS at AP
@ -53,10 +53,10 @@
* Return: None
*/
void lim_init_peer_idxpool(tpAniSirGlobal pMac, tpPESession pSessionEntry)
void lim_init_peer_idxpool(tpAniSirGlobal mac, tpPESession pSessionEntry)
{
uint8_t i;
uint8_t maxAssocSta = pMac->lim.maxStation;
uint8_t maxAssocSta = mac->lim.maxStation;
pSessionEntry->gpLimPeerIdxpool[0] = 0;
@ -105,18 +105,18 @@ void lim_init_peer_idxpool(tpAniSirGlobal pMac, tpPESession pSessionEntry)
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @return peerIdx - assigned peer Station IDx for STA
*/
uint16_t lim_assign_peer_idx(tpAniSirGlobal pMac, tpPESession pSessionEntry)
uint16_t lim_assign_peer_idx(tpAniSirGlobal mac, tpPESession pSessionEntry)
{
uint16_t peerId;
/* make sure we haven't exceeded the configurable limit on associations */
/* This count is global to ensure that it doesn't exceed the hardware limits. */
if (pe_get_current_stas_count(pMac) >=
pMac->mlme_cfg->sap_cfg.assoc_sta_limit) {
if (pe_get_current_stas_count(mac) >=
mac->mlme_cfg->sap_cfg.assoc_sta_limit) {
/* too many associations already active */
return 0;
}
@ -152,14 +152,14 @@ uint16_t lim_assign_peer_idx(tpAniSirGlobal pMac, tpPESession pSessionEntry)
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param peerIdx - peer station index that need to return to free pool
*
* @return None
*/
void
lim_release_peer_idx(tpAniSirGlobal pMac, uint16_t peerIdx,
lim_release_peer_idx(tpAniSirGlobal mac, uint16_t peerIdx,
tpPESession pSessionEntry)
{
pSessionEntry->gLimNumOfCurrentSTAs--;

View file

@ -349,12 +349,12 @@ lim_trigger_sta_deletion(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @return None
*/
void
lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
lim_tear_down_link_with_ap(tpAniSirGlobal mac, uint8_t sessionId,
tSirMacReasonCodes reasonCode)
{
tpDphHashNode pStaDs = NULL;
@ -362,7 +362,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
/* tear down the following sessionEntry */
tpPESession psessionEntry;
psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
psessionEntry = pe_find_session_by_session_id(mac, sessionId);
if (psessionEntry == NULL) {
pe_err("Session Does not exist for given sessionID");
return;
@ -380,7 +380,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
/* and cleanup by sending SME_DISASSOC_REQ to SME */
pStaDs =
dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER,
dph_get_hash_entry(mac, DPH_STA_HASH_INDEX_PEER,
&psessionEntry->dph.dphHashTable);
if (pStaDs != NULL) {
@ -388,7 +388,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
#ifdef FEATURE_WLAN_TDLS
/* Delete all TDLS peers connected before leaving BSS */
lim_delete_tdls_peers(pMac, psessionEntry);
lim_delete_tdls_peers(mac, psessionEntry);
#endif
pStaDs->mlmStaContext.disassocReason = reasonCode;
@ -404,20 +404,20 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
* buffer. This MAC will be used to send Deauth before
* connection, if we connect to same AP after HB failure.
*/
if (pMac->mlme_cfg->sta.deauth_before_connection &&
if (mac->mlme_cfg->sta.deauth_before_connection &&
eSIR_BEACON_MISSED == reasonCode) {
int apCount = pMac->lim.gLimHeartBeatApMacIndex;
int apCount = mac->lim.gLimHeartBeatApMacIndex;
if (pMac->lim.gLimHeartBeatApMacIndex)
pMac->lim.gLimHeartBeatApMacIndex = 0;
if (mac->lim.gLimHeartBeatApMacIndex)
mac->lim.gLimHeartBeatApMacIndex = 0;
else
pMac->lim.gLimHeartBeatApMacIndex = 1;
mac->lim.gLimHeartBeatApMacIndex = 1;
pe_debug("HB Failure on MAC "
MAC_ADDRESS_STR" Store it on Index %d",
MAC_ADDR_ARRAY(pStaDs->staAddr), apCount);
sir_copy_mac_addr(pMac->lim.gLimHeartBeatApMac[apCount],
sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount],
pStaDs->staAddr);
}
@ -427,15 +427,15 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId,
pStaDs->mlmStaContext.cleanupTrigger;
if (LIM_IS_STA_ROLE(psessionEntry))
lim_post_sme_message(pMac, LIM_MLM_DEAUTH_IND,
lim_post_sme_message(mac, LIM_MLM_DEAUTH_IND,
(uint32_t *) &mlmDeauthInd);
if (pMac->mlme_cfg->gen.fatal_event_trigger)
if (mac->mlme_cfg->gen.fatal_event_trigger)
cds_flush_logs(WLAN_LOG_TYPE_FATAL,
WLAN_LOG_INDICATOR_HOST_DRIVER,
WLAN_LOG_REASON_HB_FAILURE,
false, false);
lim_send_sme_deauth_ind(pMac, pStaDs, psessionEntry);
lim_send_sme_deauth_ind(mac, pStaDs, psessionEntry);
}
} /*** lim_tear_down_link_with_ap() ***/

View file

@ -69,11 +69,11 @@ static last_processed_msg rrm_link_action_frm;
\param pMac
\return NONE
-----------------------------------------------------------------*/
void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
void lim_stop_tx_and_switch_channel(tpAniSirGlobal mac, uint8_t sessionId)
{
tpPESession psessionEntry;
psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
psessionEntry = pe_find_session_by_session_id(mac, sessionId);
if (NULL == psessionEntry) {
pe_err("Session: %d not active", sessionId);
@ -88,19 +88,19 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
pe_debug("Channel switch Mode: %d",
psessionEntry->gLimChannelSwitch.switchMode);
pMac->lim.limTimers.gLimChannelSwitchTimer.sessionId = sessionId;
mac->lim.limTimers.gLimChannelSwitchTimer.sessionId = sessionId;
/* change the channel immediately only if
* the channel switch count is 0
*/
if (psessionEntry->gLimChannelSwitch.switchCount == 0) {
lim_process_channel_switch_timeout(pMac);
lim_process_channel_switch_timeout(mac);
return;
}
MTRACE(mac_trace
(pMac, TRACE_CODE_TIMER_ACTIVATE, sessionId,
(mac, TRACE_CODE_TIMER_ACTIVATE, sessionId,
eLIM_CHANNEL_SWITCH_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimChannelSwitchTimer) !=
if (tx_timer_activate(&mac->lim.limTimers.gLimChannelSwitchTimer) !=
TX_SUCCESS) {
pe_err("tx_timer_activate failed");
}
@ -117,14 +117,14 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
\param psessionEntry
\return NONE
------------------------------------------------------------*/
QDF_STATUS lim_start_channel_switch(tpAniSirGlobal pMac,
QDF_STATUS lim_start_channel_switch(tpAniSirGlobal mac,
tpPESession psessionEntry)
{
pe_debug("Starting the channel switch");
/*If channel switch is already running and it is on a different session, just return */
/*This need to be removed for MCC */
if ((lim_is_chan_switch_running(pMac) &&
if ((lim_is_chan_switch_running(mac) &&
psessionEntry->gLimSpecMgmt.dot11hChanSwState !=
eLIM_11H_CHANSW_RUNNING) || psessionEntry->csaOffloadEnable) {
pe_warn("Ignoring channel switch on session: %d",
@ -133,17 +133,17 @@ QDF_STATUS lim_start_channel_switch(tpAniSirGlobal pMac,
}
/* Deactivate and change reconfigure the timeout value */
/* lim_deactivate_and_change_timer(pMac, eLIM_CHANNEL_SWITCH_TIMER); */
/* lim_deactivate_and_change_timer(mac, eLIM_CHANNEL_SWITCH_TIMER); */
MTRACE(mac_trace
(pMac, TRACE_CODE_TIMER_DEACTIVATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_TIMER_DEACTIVATE, psessionEntry->peSessionId,
eLIM_CHANNEL_SWITCH_TIMER));
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimChannelSwitchTimer) !=
if (tx_timer_deactivate(&mac->lim.limTimers.gLimChannelSwitchTimer) !=
QDF_STATUS_SUCCESS) {
pe_err("tx_timer_deactivate failed!");
return QDF_STATUS_E_FAILURE;
}
if (tx_timer_change(&pMac->lim.limTimers.gLimChannelSwitchTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimChannelSwitchTimer,
psessionEntry->gLimChannelSwitch.switchTimeoutValue,
0) != TX_SUCCESS) {
pe_err("tx_timer_change failed");
@ -151,7 +151,7 @@ QDF_STATUS lim_start_channel_switch(tpAniSirGlobal pMac,
}
/* Prepare for 11h channel switch */
lim_prepare_for11h_channel_switch(pMac, psessionEntry);
lim_prepare_for11h_channel_switch(mac, psessionEntry);
/** Dont add any more statements here as we posted finish scan request
* to HAL, wait till we get the response
@ -627,7 +627,7 @@ out:
}
static void
__lim_process_add_ts_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_add_ts_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
}
@ -1054,11 +1054,11 @@ static void __lim_process_qos_map_configure_frame(tpAniSirGlobal mac_ctx,
#ifdef ANI_SUPPORT_11H
static void
__lim_process_basic_meas_req(tpAniSirGlobal pMac,
__lim_process_basic_meas_req(tpAniSirGlobal mac,
tpSirMacMeasReqActionFrame pMeasReqFrame,
tSirMacAddr peerMacAddr, tpPESession psessionEntry)
{
if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
if (lim_send_meas_report_frame(mac, pMeasReqFrame,
peerMacAddr, psessionEntry) !=
QDF_STATUS_SUCCESS) {
pe_err("fail to send Basic Meas report");
@ -1066,11 +1066,11 @@ __lim_process_basic_meas_req(tpAniSirGlobal pMac,
}
}
static void
__lim_process_cca_meas_req(tpAniSirGlobal pMac,
__lim_process_cca_meas_req(tpAniSirGlobal mac,
tpSirMacMeasReqActionFrame pMeasReqFrame,
tSirMacAddr peerMacAddr, tpPESession psessionEntry)
{
if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
if (lim_send_meas_report_frame(mac, pMeasReqFrame,
peerMacAddr, psessionEntry) !=
QDF_STATUS_SUCCESS) {
pe_err("fail to send CCA Meas report");
@ -1078,11 +1078,11 @@ __lim_process_cca_meas_req(tpAniSirGlobal pMac,
}
}
static void
__lim_process_rpi_meas_req(tpAniSirGlobal pMac,
__lim_process_rpi_meas_req(tpAniSirGlobal mac,
tpSirMacMeasReqActionFrame pMeasReqFrame,
tSirMacAddr peerMacAddr, tpPESession psessionEntry)
{
if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
if (lim_send_meas_report_frame(mac, pMeasReqFrame,
peerMacAddr, psessionEntry) !=
QDF_STATUS_SUCCESS) {
pe_err("fail to send RPI Meas report");
@ -1090,7 +1090,7 @@ __lim_process_rpi_meas_req(tpAniSirGlobal pMac,
}
}
static void
__lim_process_measurement_request_frame(tpAniSirGlobal pMac,
__lim_process_measurement_request_frame(tpAniSirGlobal mac,
uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
@ -1107,22 +1107,22 @@ __lim_process_measurement_request_frame(tpAniSirGlobal pMac,
if (!pMeasReqFrame)
return;
if (sir_convert_meas_req_frame2_struct(pMac, pBody, pMeasReqFrame, frameLen)
if (sir_convert_meas_req_frame2_struct(mac, pBody, pMeasReqFrame, frameLen)
!= QDF_STATUS_SUCCESS) {
pe_warn("Rcv invalid Measurement Request Action Frame");
return;
}
switch (pMeasReqFrame->measReqIE.measType) {
case SIR_MAC_BASIC_MEASUREMENT_TYPE:
__lim_process_basic_meas_req(pMac, pMeasReqFrame, pHdr->sa,
__lim_process_basic_meas_req(mac, pMeasReqFrame, pHdr->sa,
psessionEntry);
break;
case SIR_MAC_CCA_MEASUREMENT_TYPE:
__lim_process_cca_meas_req(pMac, pMeasReqFrame, pHdr->sa,
__lim_process_cca_meas_req(mac, pMeasReqFrame, pHdr->sa,
psessionEntry);
break;
case SIR_MAC_RPI_MEASUREMENT_TYPE:
__lim_process_rpi_meas_req(pMac, pMeasReqFrame, pHdr->sa,
__lim_process_rpi_meas_req(mac, pMeasReqFrame, pHdr->sa,
psessionEntry);
break;
default:
@ -1132,7 +1132,7 @@ __lim_process_measurement_request_frame(tpAniSirGlobal pMac,
}
} /*** end limProcessMeasurementRequestFrame ***/
static void
__lim_process_tpc_request_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_tpc_request_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
@ -1149,12 +1149,12 @@ __lim_process_tpc_request_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
if (!pTpcReqFrame)
return;
if (sir_convert_tpc_req_frame2_struct(pMac, pBody, pTpcReqFrame, frameLen) !=
if (sir_convert_tpc_req_frame2_struct(mac, pBody, pTpcReqFrame, frameLen) !=
QDF_STATUS_SUCCESS) {
pe_warn("Rcv invalid TPC Req Action Frame");
return;
}
if (lim_send_tpc_report_frame(pMac,
if (lim_send_tpc_report_frame(mac,
pTpcReqFrame,
pHdr->sa, psessionEntry) != QDF_STATUS_SUCCESS) {
pe_err("fail to send TPC Report Frame");
@ -1164,7 +1164,7 @@ __lim_process_tpc_request_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
#endif
static void
__lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_sm_power_save_update(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
@ -1181,16 +1181,16 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
pSta =
dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
dph_lookup_hash_entry(mac, pHdr->sa, &aid,
&psessionEntry->dph.dphHashTable);
if (pSta == NULL) {
pe_err("STA context not found - ignoring UpdateSM PSave Mode from");
lim_print_mac_addr(pMac, pHdr->sa, LOGE);
lim_print_mac_addr(mac, pHdr->sa, LOGE);
return;
}
/**Unpack the received frame */
nStatus = dot11f_unpack_sm_power_save(pMac, pBody, frameLen,
nStatus = dot11f_unpack_sm_power_save(mac, pBody, frameLen,
&frmSMPower, false);
if (DOT11F_FAILED(nStatus)) {
@ -1230,13 +1230,13 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/** Update in the HAL Station Table for the Update of the Protection Mode */
pSta->htMIMOPSState = state;
lim_post_sm_state_update(pMac, pSta->staIndex, pSta->htMIMOPSState,
lim_post_sm_state_update(mac, pSta->staIndex, pSta->htMIMOPSState,
pSta->staAddr, psessionEntry->smeSessionId);
}
static void
__lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_radio_measure_request(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
@ -1256,15 +1256,15 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
curr_seq_num = ((pHdr->seqControl.seqNumHi <<
HIGH_SEQ_NUM_OFFSET) |
pHdr->seqControl.seqNumLo);
if (curr_seq_num == pMac->rrm.rrmPEContext.prev_rrm_report_seq_num &&
pMac->rrm.rrmPEContext.pCurrentReq) {
if (curr_seq_num == mac->rrm.rrmPEContext.prev_rrm_report_seq_num &&
mac->rrm.rrmPEContext.pCurrentReq) {
pe_err("rrm report req frame, seq num: %d is already in progress, drop it",
curr_seq_num);
return;
}
/* Save seq no of currently processing rrm report req frame */
pMac->rrm.rrmPEContext.prev_rrm_report_seq_num = curr_seq_num;
lim_send_sme_mgmt_frame_ind(pMac, pHdr->fc.subType, (uint8_t *)pHdr,
mac->rrm.rrmPEContext.prev_rrm_report_seq_num = curr_seq_num;
lim_send_sme_mgmt_frame_ind(mac, pHdr->fc.subType, (uint8_t *)pHdr,
frameLen + sizeof(tSirMacMgmtHdr), 0,
WMA_GET_RX_CH(pRxPacketInfo), psessionEntry,
WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo));
@ -1274,7 +1274,7 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
return;
/**Unpack the received frame */
nStatus = dot11f_unpack_radio_measurement_request(pMac, pBody,
nStatus = dot11f_unpack_radio_measurement_request(mac, pBody,
frameLen, frm, false);
if (DOT11F_FAILED(nStatus)) {
@ -1289,14 +1289,14 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
}
/* Call rrm function to handle the request. */
rrm_process_radio_measurement_request(pMac, pHdr->sa, frm,
rrm_process_radio_measurement_request(mac, pHdr->sa, frm,
psessionEntry);
err:
qdf_mem_free(frm);
}
static QDF_STATUS
__lim_process_link_measurement_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_link_measurement_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
@ -1314,7 +1314,7 @@ __lim_process_link_measurement_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/**Unpack the received frame */
nStatus =
dot11f_unpack_link_measurement_request(pMac, pBody, frameLen,
dot11f_unpack_link_measurement_request(mac, pBody, frameLen,
&frm, false);
if (DOT11F_FAILED(nStatus)) {
@ -1329,13 +1329,13 @@ __lim_process_link_measurement_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
}
/* Call rrm function to handle the request. */
return rrm_process_link_measurement_request(pMac, pRxPacketInfo, &frm,
return rrm_process_link_measurement_request(mac, pRxPacketInfo, &frm,
psessionEntry);
}
static void
__lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
__lim_process_neighbor_report(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
@ -1358,7 +1358,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/**Unpack the received frame */
nStatus =
dot11f_unpack_neighbor_report_response(pMac, pBody,
dot11f_unpack_neighbor_report_response(mac, pBody,
frameLen, pFrm, false);
if (DOT11F_FAILED(nStatus)) {
@ -1373,7 +1373,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
nStatus, frameLen);
}
/* Call rrm function to handle the request. */
rrm_process_neighbor_report_response(pMac, pFrm, psessionEntry);
rrm_process_neighbor_report_response(mac, pFrm, psessionEntry);
qdf_mem_free(pFrm);
}
@ -1393,13 +1393,13 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param *pRxPacketInfo - Handle to the Rx packet info
* @param psessionEntry - PE session entry
*
* @return None
*/
static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal mac,
uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
@ -1425,7 +1425,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
return;
/* 11w offload is enabled then firmware should not fwd this frame */
if (LIM_IS_STA_ROLE(psessionEntry) && pMac->pmf_offload) {
if (LIM_IS_STA_ROLE(psessionEntry) && mac->pmf_offload) {
pe_err("11w offload enabled, SA Query req isn't expected");
return;
}
@ -1439,7 +1439,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
qdf_mem_copy(&transId[0], &pBody[2], 2);
/* Send 11w SA query response action frame */
if (lim_send_sa_query_response_frame(pMac,
if (lim_send_sa_query_response_frame(mac,
transId,
pHdr->sa,
psessionEntry) != QDF_STATUS_SUCCESS) {
@ -1461,12 +1461,12 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param *pRxPacketInfo - Handle to the Rx packet info
* @param psessionEntry - PE session entry
* @return None
*/
static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal mac,
uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
@ -1491,7 +1491,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
* Forward to SME to HDD to wpa_supplicant.
*/
if (LIM_IS_STA_ROLE(psessionEntry)) {
lim_send_sme_mgmt_frame_ind(pMac, pHdr->fc.subType,
lim_send_sme_mgmt_frame_ind(mac, pHdr->fc.subType,
(uint8_t *)pHdr,
frame_len + sizeof(tSirMacMgmtHdr),
0,
@ -1507,7 +1507,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
return;
pSta =
dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
dph_lookup_hash_entry(mac, pHdr->sa, &aid,
&psessionEntry->dph.dphHashTable);
if (NULL == pSta)
return;
@ -1556,7 +1556,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
*
***NOTE:
*
* @param pMac - Global MAC structure
* @param mac - Global MAC structure
* @param psessionEntry - PE session entry
* @param pHdr - Frame header
* @param category - Action frame category
@ -1564,7 +1564,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
*/
static bool
lim_drop_unprotected_action_frame(tpAniSirGlobal pMac, tpPESession psessionEntry,
lim_drop_unprotected_action_frame(tpAniSirGlobal mac, tpPESession psessionEntry,
tpSirMacMgmtHdr pHdr, uint8_t category)
{
uint16_t aid;
@ -1573,7 +1573,7 @@ lim_drop_unprotected_action_frame(tpAniSirGlobal pMac, tpPESession psessionEntry
if (LIM_IS_AP_ROLE(psessionEntry)) {
pStaDs =
dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
dph_lookup_hash_entry(mac, pHdr->sa, &aid,
&psessionEntry->dph.dphHashTable);
if (pStaDs != NULL)
if (pStaDs->rmfEnabled)
@ -2193,11 +2193,11 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param *pBd - A pointer to Buffer descriptor + associated PDUs
* @return None
*/
void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd)
void lim_process_action_frame_no_session(tpAniSirGlobal mac, uint8_t *pBd)
{
tpSirMacMgmtHdr mac_hdr = WMA_GET_RX_MAC_HEADER(pBd);
uint32_t frame_len = WMA_GET_RX_PAYLOAD_LEN(pBd);
@ -2248,7 +2248,7 @@ void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd)
* Forward the GAS frames to wpa_supplicant
* type is ACTION
*/
lim_send_sme_mgmt_frame_ind(pMac,
lim_send_sme_mgmt_frame_ind(mac,
mac_hdr->fc.subType,
(uint8_t *) mac_hdr,
frame_len + sizeof(tSirMacMgmtHdr), 0,

View file

@ -44,7 +44,7 @@
#include "lim_send_messages.h"
#include "lim_process_fils.h"
extern QDF_STATUS sch_beacon_edca_process(tpAniSirGlobal pMac,
extern QDF_STATUS sch_beacon_edca_process(tpAniSirGlobal mac,
tSirMacEdcaParamSetIE *edca, tpPESession psessionEntry);
/**

View file

@ -69,7 +69,7 @@
* @return 0 or 1 (Valid)
*/
static inline unsigned int is_auth_valid(tpAniSirGlobal pMac,
static inline unsigned int is_auth_valid(tpAniSirGlobal mac,
tpSirMacAuthFrameBody auth,
tpPESession sessionEntry)
{
@ -1508,7 +1508,7 @@ free:
* is received we will have a session in progress. !!!!!
***----------------------------------------------------------------------
*/
QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal mac, uint8_t *pBd,
void *body)
{
tpSirMacMgmtHdr pHdr;
@ -1531,14 +1531,14 @@ QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
/* Auth frame has come on a new BSS, however, we need to find the session
* from where the auth-req was sent to the new AP
*/
for (i = 0; i < pMac->lim.maxBssId; i++) {
for (i = 0; i < mac->lim.maxBssId; i++) {
/* Find first free room in session table */
if (pMac->lim.gpSession[i].valid == true &&
pMac->lim.gpSession[i].ftPEContext.ftPreAuthSession ==
if (mac->lim.gpSession[i].valid == true &&
mac->lim.gpSession[i].ftPEContext.ftPreAuthSession ==
true) {
/* Found the session */
psessionEntry = &pMac->lim.gpSession[i];
pMac->lim.gpSession[i].ftPEContext.ftPreAuthSession =
psessionEntry = &mac->lim.gpSession[i];
mac->lim.gpSession[i].ftPEContext.ftPreAuthSession =
false;
}
}
@ -1558,8 +1558,8 @@ QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
pe_err("Error: Frame len = 0");
return QDF_STATUS_E_FAILURE;
}
lim_print_mac_addr(pMac, pHdr->bssId, LOGD);
lim_print_mac_addr(pMac,
lim_print_mac_addr(mac, pHdr->bssId, LOGD);
lim_print_mac_addr(mac,
psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId,
LOGD);
pe_debug("seqControl: 0x%X",
@ -1610,13 +1610,13 @@ QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
/* Stopping timer now, that we have our unicast from the AP */
/* of our choice. */
lim_deactivate_and_change_timer(pMac, eLIM_FT_PREAUTH_RSP_TIMER);
lim_deactivate_and_change_timer(mac, eLIM_FT_PREAUTH_RSP_TIMER);
/* Save off the auth resp. */
if ((sir_convert_auth_frame2_struct(pMac, pBody, frameLen, &rxAuthFrame) !=
if ((sir_convert_auth_frame2_struct(mac, pBody, frameLen, &rxAuthFrame) !=
QDF_STATUS_SUCCESS)) {
pe_err("failed to convert Auth frame to struct");
lim_handle_ft_pre_auth_rsp(pMac, QDF_STATUS_E_FAILURE, NULL, 0,
lim_handle_ft_pre_auth_rsp(mac, QDF_STATUS_E_FAILURE, NULL, 0,
psessionEntry);
return QDF_STATUS_E_FAILURE;
}
@ -1626,7 +1626,7 @@ QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
(uint32_t) pRxAuthFrameBody->authAlgoNumber,
(uint32_t) pRxAuthFrameBody->authTransactionSeqNumber,
(uint32_t) pRxAuthFrameBody->authStatusCode,
(uint32_t) pMac->lim.gLimNumPreAuthContexts);
(uint32_t) mac->lim.gLimNumPreAuthContexts);
switch (pRxAuthFrameBody->authTransactionSeqNumber) {
case SIR_MAC_AUTH_FRAME_2:
if (pRxAuthFrameBody->authStatusCode != eSIR_MAC_SUCCESS_STATUS) {
@ -1647,7 +1647,7 @@ QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd,
}
/* Send the Auth response to SME */
lim_handle_ft_pre_auth_rsp(pMac, ret_status, pBody, frameLen, psessionEntry);
lim_handle_ft_pre_auth_rsp(mac, ret_status, pBody, frameLen, psessionEntry);
return ret_status;
}

View file

@ -37,12 +37,12 @@
#include "sch_api.h"
#include "rrm_api.h"
static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry);
static void lim_update_config(tpAniSirGlobal mac, tpPESession psessionEntry);
void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry)
void lim_set_cfg_protection(tpAniSirGlobal mac, tpPESession pesessionEntry)
{
uint32_t val = 0;
struct wlan_mlme_cfg *mlme_cfg = pMac->mlme_cfg;
struct wlan_mlme_cfg *mlme_cfg = mac->mlme_cfg;
if (pesessionEntry != NULL && LIM_IS_AP_ROLE(pesessionEntry)) {
if (pesessionEntry->gLimProtectionControl ==
@ -63,32 +63,32 @@ void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry)
pesessionEntry->cfgProtection.obss);
}
} else {
pMac->lim.gLimProtectionControl =
mac->lim.gLimProtectionControl =
mlme_cfg->sap_protection_cfg.protection_force_policy;
if (pMac->lim.gLimProtectionControl ==
if (mac->lim.gLimProtectionControl ==
MLME_FORCE_POLICY_PROTECTION_DISABLE)
qdf_mem_set((void *)&pMac->lim.cfgProtection,
qdf_mem_set((void *)&mac->lim.cfgProtection,
sizeof(tCfgProtection), 0);
else {
val = mlme_cfg->sap_protection_cfg.protection_enabled;
pMac->lim.cfgProtection.fromlla =
mac->lim.cfgProtection.fromlla =
(val >> MLME_PROTECTION_ENABLED_FROM_llA) & 1;
pMac->lim.cfgProtection.fromllb =
mac->lim.cfgProtection.fromllb =
(val >> MLME_PROTECTION_ENABLED_FROM_llB) & 1;
pMac->lim.cfgProtection.fromllg =
mac->lim.cfgProtection.fromllg =
(val >> MLME_PROTECTION_ENABLED_FROM_llG) & 1;
pMac->lim.cfgProtection.ht20 =
mac->lim.cfgProtection.ht20 =
(val >> MLME_PROTECTION_ENABLED_HT_20) & 1;
pMac->lim.cfgProtection.nonGf =
mac->lim.cfgProtection.nonGf =
(val >> MLME_PROTECTION_ENABLED_NON_GF) & 1;
pMac->lim.cfgProtection.lsigTxop =
mac->lim.cfgProtection.lsigTxop =
(val >> MLME_PROTECTION_ENABLED_LSIG_TXOP) & 1;
pMac->lim.cfgProtection.rifs =
mac->lim.cfgProtection.rifs =
(val >> MLME_PROTECTION_ENABLED_RIFS) & 1;
pMac->lim.cfgProtection.obss =
mac->lim.cfgProtection.obss =
(val >> MLME_PROTECTION_ENABLED_OBSS) & 1;
}
@ -111,11 +111,11 @@ void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry)
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param cfgId - ID of CFG parameter that got updated
* @return None
*/
void lim_handle_param_update(tpAniSirGlobal pMac, eUpdateIEsType cfgId)
void lim_handle_param_update(tpAniSirGlobal mac, eUpdateIEsType cfgId)
{
struct scheduler_msg msg = { 0 };
QDF_STATUS status;
@ -126,7 +126,7 @@ void lim_handle_param_update(tpAniSirGlobal pMac, eUpdateIEsType cfgId)
case eUPDATE_IE_PROBE_BCN:
{
msg.type = SIR_LIM_UPDATE_BEACON;
status = lim_post_msg_api(pMac, &msg);
status = lim_post_msg_api(mac, &msg);
if (status != QDF_STATUS_SUCCESS)
pe_err("Failed lim_post_msg_api %u", status);
@ -153,11 +153,11 @@ void lim_handle_param_update(tpAniSirGlobal pMac, eUpdateIEsType cfgId)
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @return None
*/
void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
void lim_apply_configuration(tpAniSirGlobal mac, tpPESession psessionEntry)
{
uint32_t val = 0, phyMode;
@ -165,14 +165,14 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
psessionEntry->limSentCapsChangeNtf = false;
lim_get_phy_mode(pMac, &phyMode, psessionEntry);
lim_get_phy_mode(mac, &phyMode, psessionEntry);
lim_update_config(pMac, psessionEntry);
lim_update_config(mac, psessionEntry);
lim_get_short_slot_from_phy_mode(pMac, psessionEntry, phyMode,
lim_get_short_slot_from_phy_mode(mac, psessionEntry, phyMode,
&psessionEntry->shortSlotTimeSupported);
lim_set_cfg_protection(pMac, psessionEntry);
lim_set_cfg_protection(mac, psessionEntry);
/* Added for BT - AMP Support */
if (LIM_IS_AP_ROLE(psessionEntry) ||
@ -182,12 +182,12 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
if (psessionEntry->statypeForBss == STA_ENTRY_SELF) {
pe_debug("Initializing BT-AMP beacon generation");
sch_set_beacon_interval(pMac, psessionEntry);
sch_set_fixed_beacon_fields(pMac, psessionEntry);
sch_set_beacon_interval(mac, psessionEntry);
sch_set_fixed_beacon_fields(mac, psessionEntry);
}
}
if (wlan_cfg_get_int(pMac, WNI_CFG_SCAN_IN_POWERSAVE, &val) !=
if (wlan_cfg_get_int(mac, WNI_CFG_SCAN_IN_POWERSAVE, &val) !=
QDF_STATUS_SUCCESS) {
pe_err("could not retrieve WNI_CFG_SCAN_IN_POWERSAVE");
return;
@ -211,21 +211,21 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
* @return None
*/
static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry)
static void lim_update_config(tpAniSirGlobal mac, tpPESession psessionEntry)
{
uint32_t val;
bool enabled;
psessionEntry->beaconParams.fShortPreamble =
pMac->mlme_cfg->ht_caps.short_preamble;
mac->mlme_cfg->ht_caps.short_preamble;
/* In STA case this parameter is filled during the join request */
if (LIM_IS_AP_ROLE(psessionEntry) ||
LIM_IS_IBSS_ROLE(psessionEntry)) {
enabled = pMac->mlme_cfg->wmm_params.wme_enabled;
enabled = mac->mlme_cfg->wmm_params.wme_enabled;
psessionEntry->limWmeEnabled = enabled;
}
enabled = pMac->mlme_cfg->wmm_params.wsm_enabled;
enabled = mac->mlme_cfg->wmm_params.wsm_enabled;
psessionEntry->limWsmEnabled = enabled;
if ((!psessionEntry->limWmeEnabled) && (psessionEntry->limWsmEnabled)) {
@ -234,17 +234,17 @@ static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry)
}
/* In STA , this parameter is filled during the join request */
if (LIM_IS_AP_ROLE(psessionEntry) || LIM_IS_IBSS_ROLE(psessionEntry)) {
enabled = pMac->mlme_cfg->wmm_params.qos_enabled;
enabled = mac->mlme_cfg->wmm_params.qos_enabled;
psessionEntry->limQosEnabled = enabled;
}
psessionEntry->limHcfEnabled = pMac->mlme_cfg->feature_flags.enable_hcf;
psessionEntry->limHcfEnabled = mac->mlme_cfg->feature_flags.enable_hcf;
/* AP: WSM should enable HCF as well, for STA enable WSM only after */
/* association response is received */
if (psessionEntry->limWsmEnabled && LIM_IS_AP_ROLE(psessionEntry))
psessionEntry->limHcfEnabled = 1;
if (wlan_cfg_get_int(pMac, WNI_CFG_11D_ENABLED, &val) != QDF_STATUS_SUCCESS)
if (wlan_cfg_get_int(mac, WNI_CFG_11D_ENABLED, &val) != QDF_STATUS_SUCCESS)
pe_err("cfg get 11d enabled failed");
psessionEntry->lim11dEnabled = (val) ? 1 : 0;

View file

@ -52,13 +52,13 @@
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param *pRxPacketInfo - A pointer to Buffer descriptor + associated PDUs
* @return None
*/
void
lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
lim_process_deauth_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
uint8_t *pBody;
@ -85,13 +85,13 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
((eLIM_SME_WT_DISASSOC_STATE == psessionEntry->limSmeState) ||
(eLIM_SME_WT_DEAUTH_STATE == psessionEntry->limSmeState))) {
/*Every 15th deauth frame will be logged in kmsg */
if (!(pMac->lim.deauthMsgCnt & 0xF)) {
if (!(mac->lim.deauthMsgCnt & 0xF)) {
pe_debug("received Deauth frame in DEAUTH_WT_STATE"
"(already processing previously received DEAUTH frame)"
"Dropping this.. Deauth Failed %d",
++pMac->lim.deauthMsgCnt);
++mac->lim.deauthMsgCnt);
} else {
pMac->lim.deauthMsgCnt++;
mac->lim.deauthMsgCnt++;
}
return;
}
@ -109,7 +109,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
pe_debug("received Deauth frame for a MC address");
return;
}
if (!lim_validate_received_frame_a1_addr(pMac,
if (!lim_validate_received_frame_a1_addr(mac,
pHdr->da, psessionEntry)) {
pe_err("rx frame doesn't have valid a1 address, drop it");
return;
@ -124,7 +124,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* When 11w offload is enabled then
* firmware should not fwd this frame
*/
if (LIM_IS_STA_ROLE(psessionEntry) && pMac->pmf_offload) {
if (LIM_IS_STA_ROLE(psessionEntry) && mac->pmf_offload) {
pe_err("11w offload is enable,unprotected deauth is not expected");
return;
}
@ -133,7 +133,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/* an SA query */
/* send the unprotected frame indication to SME */
lim_send_sme_unprotected_mgmt_frame_ind(pMac, pHdr->fc.subType,
lim_send_sme_unprotected_mgmt_frame_ind(mac, pHdr->fc.subType,
(uint8_t *) pHdr,
(frameLen +
sizeof(tSirMacMgmtHdr)),
@ -156,7 +156,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
reasonCode, lim_dot11_reason_str(reasonCode),
MAC_ADDR_ARRAY(pHdr->sa));
if (pMac->mlme_cfg->gen.fatal_event_trigger &&
if (mac->mlme_cfg->gen.fatal_event_trigger &&
(reasonCode != eSIR_MAC_UNSPEC_FAILURE_REASON &&
reasonCode != eSIR_MAC_DEAUTH_LEAVING_BSS_REASON &&
reasonCode != eSIR_MAC_DISASSOC_LEAVING_BSS_REASON)) {
@ -166,13 +166,13 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
false, false);
}
lim_diag_event_report(pMac, WLAN_PE_DIAG_DEAUTH_FRAME_EVENT,
lim_diag_event_report(mac, WLAN_PE_DIAG_DEAUTH_FRAME_EVENT,
psessionEntry, 0, reasonCode);
if (lim_check_disassoc_deauth_ack_pending(pMac, (uint8_t *) pHdr->sa)) {
if (lim_check_disassoc_deauth_ack_pending(mac, (uint8_t *) pHdr->sa)) {
pe_debug("Ignore the Deauth received, while waiting for ack of "
"disassoc/deauth");
lim_clean_up_disassoc_deauth_req(pMac, (uint8_t *) pHdr->sa, 1);
lim_clean_up_disassoc_deauth_req(mac, (uint8_t *) pHdr->sa, 1);
return;
}
@ -242,11 +242,11 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* with normal deauth processing.
*/
pRoamSessionEntry =
pe_find_session_by_bssid(pMac, psessionEntry->limReAssocbssId,
pe_find_session_by_bssid(mac, psessionEntry->limReAssocbssId,
&roamSessionId);
if (lim_is_reassoc_in_progress(pMac, psessionEntry) ||
lim_is_reassoc_in_progress(pMac, pRoamSessionEntry) ||
if (lim_is_reassoc_in_progress(mac, psessionEntry) ||
lim_is_reassoc_in_progress(mac, pRoamSessionEntry) ||
psessionEntry->fw_roaming_started) {
/*
* For LFR3, the roaming bssid is not known during ROAM_START,
@ -254,7 +254,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* roaming is being done in the firmware
*/
if (psessionEntry->fw_roaming_started &&
IS_CURRENT_BSSID(pMac, pHdr->sa, psessionEntry)) {
IS_CURRENT_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_debug("LFR3: Drop deauth frame from connected AP");
/*
* recvd_deauth_while_roaming will be stored in the
@ -269,7 +269,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
psessionEntry->deauth_disassoc_rc = reasonCode;
return;
}
if (!IS_REASSOC_BSSID(pMac, pHdr->sa, psessionEntry)) {
if (!IS_REASSOC_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_debug("Rcv Deauth from unknown/different "
"AP while ReAssoc. Ignore " MAC_ADDRESS_STR
"limReAssocbssId : " MAC_ADDRESS_STR,
@ -281,14 +281,14 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/** Received deauth from the new AP to which we tried to ReAssociate.
* Drop ReAssoc and Restore the Previous context( current connected AP).
*/
if (!IS_CURRENT_BSSID(pMac, pHdr->sa, psessionEntry)) {
if (!IS_CURRENT_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_debug("received DeAuth from the New AP to "
"which ReAssoc is sent " MAC_ADDRESS_STR
"psessionEntry->bssId: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHdr->sa),
MAC_ADDR_ARRAY(psessionEntry->bssId));
lim_restore_pre_reassoc_state(pMac,
lim_restore_pre_reassoc_state(mac,
eSIR_SME_REASSOC_REFUSED,
reasonCode,
psessionEntry);
@ -300,20 +300,20 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* nor associated with, then ignore deauth and delete Pre-auth entry.
*/
if (!LIM_IS_AP_ROLE(psessionEntry)) {
if (!IS_CURRENT_BSSID(pMac, pHdr->bssId, psessionEntry)) {
if (!IS_CURRENT_BSSID(mac, pHdr->bssId, psessionEntry)) {
pe_err("received DeAuth from an AP other "
"than we're trying to join. Ignore. "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->sa));
if (lim_search_pre_auth_list(pMac, pHdr->sa)) {
if (lim_search_pre_auth_list(mac, pHdr->sa)) {
pe_debug("Preauth entry exist. Deleting");
lim_delete_pre_auth_node(pMac, pHdr->sa);
lim_delete_pre_auth_node(mac, pHdr->sa);
}
return;
}
}
lim_perform_deauth(pMac, psessionEntry, reasonCode, pHdr->sa,
lim_perform_deauth(mac, psessionEntry, reasonCode, pHdr->sa,
frame_rssi);
@ -491,7 +491,7 @@ void lim_perform_deauth(tpAniSirGlobal mac_ctx, tpPESession pe_session,
default:
return;
} /* end switch (pMac->lim.gLimSystemRole) */
} /* end switch (mac->lim.gLimSystemRole) */
/**
* Extract 'associated' context for STA, if any.

View file

@ -56,12 +56,12 @@
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param *pRxPacketInfo - A pointer to Rx packet info structure
* @return None
*/
void
lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
lim_process_disassoc_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
tpPESession psessionEntry)
{
uint8_t *pBody;
@ -90,7 +90,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
pe_err("received Disassoc frame for a MC address");
return;
}
if (!lim_validate_received_frame_a1_addr(pMac,
if (!lim_validate_received_frame_a1_addr(mac,
pHdr->da, psessionEntry)) {
pe_err("rx frame doesn't have valid a1 address, drop it");
return;
@ -99,13 +99,13 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
if (LIM_IS_STA_ROLE(psessionEntry) &&
((eLIM_SME_WT_DISASSOC_STATE == psessionEntry->limSmeState) ||
(eLIM_SME_WT_DEAUTH_STATE == psessionEntry->limSmeState))) {
if (!(pMac->lim.disassocMsgCnt & 0xF)) {
if (!(mac->lim.disassocMsgCnt & 0xF)) {
pe_debug("received Disassoc frame in %s"
"already processing previously received Disassoc frame, dropping this %d",
lim_sme_state_str(psessionEntry->limSmeState),
++pMac->lim.disassocMsgCnt);
++mac->lim.disassocMsgCnt);
} else {
pMac->lim.disassocMsgCnt++;
mac->lim.disassocMsgCnt++;
}
return;
}
@ -119,7 +119,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* When 11w offload is enabled then
* firmware should not fwd this frame
*/
if (LIM_IS_STA_ROLE(psessionEntry) && pMac->pmf_offload) {
if (LIM_IS_STA_ROLE(psessionEntry) && mac->pmf_offload) {
pe_err("11w offload is enable,unprotected disassoc is not expected");
return;
}
@ -127,7 +127,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
/* If the frame received is unprotected, forward it to the supplicant to initiate */
/* an SA query */
/* send the unprotected frame indication to SME */
lim_send_sme_unprotected_mgmt_frame_ind(pMac, pHdr->fc.subType,
lim_send_sme_unprotected_mgmt_frame_ind(mac, pHdr->fc.subType,
(uint8_t *) pHdr,
(frame_len +
sizeof(tSirMacMgmtHdr)),
@ -152,10 +152,10 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
lim_mlm_state_str(psessionEntry->limMlmState),
psessionEntry->limSmeState, frame_rssi, reasonCode,
lim_dot11_reason_str(reasonCode), MAC_ADDR_ARRAY(pHdr->sa));
lim_diag_event_report(pMac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT,
lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT,
psessionEntry, 0, reasonCode);
if (pMac->mlme_cfg->gen.fatal_event_trigger &&
if (mac->mlme_cfg->gen.fatal_event_trigger &&
(reasonCode != eSIR_MAC_UNSPEC_FAILURE_REASON &&
reasonCode != eSIR_MAC_DEAUTH_LEAVING_BSS_REASON &&
reasonCode != eSIR_MAC_DISASSOC_LEAVING_BSS_REASON)) {
@ -169,7 +169,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* This is maintained by DPH and created by LIM.
*/
pStaDs =
dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
dph_lookup_hash_entry(mac, pHdr->sa, &aid,
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
@ -183,25 +183,25 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
return;
}
if (lim_check_disassoc_deauth_ack_pending(pMac, (uint8_t *) pHdr->sa)) {
if (lim_check_disassoc_deauth_ack_pending(mac, (uint8_t *) pHdr->sa)) {
pe_err("Ignore the DisAssoc received, while waiting for ack of disassoc/deauth");
lim_clean_up_disassoc_deauth_req(pMac, (uint8_t *) pHdr->sa, 1);
lim_clean_up_disassoc_deauth_req(mac, (uint8_t *) pHdr->sa, 1);
return;
}
if (pMac->lim.disassocMsgCnt != 0) {
pMac->lim.disassocMsgCnt = 0;
if (mac->lim.disassocMsgCnt != 0) {
mac->lim.disassocMsgCnt = 0;
}
/** If we are in the Wait for ReAssoc Rsp state */
if (lim_is_reassoc_in_progress(pMac, psessionEntry)) {
if (lim_is_reassoc_in_progress(mac, psessionEntry)) {
/*
* For LFR3, the roaming bssid is not known during ROAM_START,
* so check if the disassoc is received from current AP when
* roaming is being done in the firmware
*/
if (psessionEntry->fw_roaming_started &&
IS_CURRENT_BSSID(pMac, pHdr->sa, psessionEntry)) {
IS_CURRENT_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_debug("Dropping disassoc frame from connected AP");
psessionEntry->recvd_disassoc_while_roaming = true;
psessionEntry->deauth_disassoc_rc = reasonCode;
@ -212,16 +212,16 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
* b. Unknown AP
* drop/ignore the DisAssoc received
*/
if (!IS_REASSOC_BSSID(pMac, pHdr->sa, psessionEntry)) {
if (!IS_REASSOC_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_err("Ignore DisAssoc while Processing ReAssoc");
return;
}
/** If the Disassoc is received from the new AP to which we tried to ReAssociate
* Drop ReAssoc and Restore the Previous context( current connected AP).
*/
if (!IS_CURRENT_BSSID(pMac, pHdr->sa, psessionEntry)) {
if (!IS_CURRENT_BSSID(mac, pHdr->sa, psessionEntry)) {
pe_debug("received Disassoc from the New AP to which ReAssoc is sent");
lim_restore_pre_reassoc_state(pMac,
lim_restore_pre_reassoc_state(mac,
eSIR_SME_REASSOC_REFUSED,
reasonCode,
psessionEntry);
@ -293,7 +293,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
return;
}
pStaDs->sta_deletion_in_progress = true;
lim_disassoc_tdls_peers(pMac, psessionEntry, pHdr->sa);
lim_disassoc_tdls_peers(mac, psessionEntry, pHdr->sa);
if (pStaDs->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) {
/**
* Requesting STA is in some 'transient' state?
@ -309,7 +309,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
} /* if (pStaDs->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */
lim_perform_disassoc(pMac, frame_rssi, reasonCode,
lim_perform_disassoc(mac, frame_rssi, reasonCode,
psessionEntry, pHdr->sa);
} /*** end lim_process_disassoc_frame() ***/

View file

@ -162,7 +162,7 @@ end:
/**
* lim_handle_sme_reaasoc_result() - Handle the reassoc result
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @resultCode: Result code
* @protStatusCode: Protocol Status Code
* @psessionEntry: PE Session
@ -173,7 +173,7 @@ end:
*
* Return: None
*/
static void lim_handle_sme_reaasoc_result(tpAniSirGlobal pMac,
static void lim_handle_sme_reaasoc_result(tpAniSirGlobal mac,
tSirResultCodes resultCode, uint16_t protStatusCode,
tpPESession psessionEntry)
{
@ -189,7 +189,7 @@ static void lim_handle_sme_reaasoc_result(tpAniSirGlobal pMac,
smetransactionId = psessionEntry->transactionId;
if (resultCode != eSIR_SME_SUCCESS) {
pStaDs =
dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER,
dph_get_hash_entry(mac, DPH_STA_HASH_INDEX_PEER,
&psessionEntry->dph.dphHashTable);
if (pStaDs != NULL) {
pStaDs->mlmStaContext.disassocReason =
@ -198,10 +198,10 @@ static void lim_handle_sme_reaasoc_result(tpAniSirGlobal pMac,
eLIM_JOIN_FAILURE;
pStaDs->mlmStaContext.resultCode = resultCode;
pStaDs->mlmStaContext.protStatusCode = protStatusCode;
lim_cleanup_rx_path(pMac, pStaDs, psessionEntry);
lim_cleanup_rx_path(mac, pStaDs, psessionEntry);
/* Cleanup if add bss failed */
if (psessionEntry->add_bss_failed) {
dph_delete_hash_entry(pMac,
dph_delete_hash_entry(mac,
pStaDs->staAddr, pStaDs->assocId,
&psessionEntry->dph.dphHashTable);
goto error;
@ -213,11 +213,11 @@ error:
/* Delete the session if REASSOC failure occurred. */
if (resultCode != eSIR_SME_SUCCESS) {
if (NULL != psessionEntry) {
pe_delete_session(pMac, psessionEntry);
pe_delete_session(mac, psessionEntry);
psessionEntry = NULL;
}
}
lim_send_sme_join_reassoc_rsp(pMac, eWNI_SME_REASSOC_RSP, resultCode,
lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_REASSOC_RSP, resultCode,
protStatusCode, psessionEntry, smesessionId, smetransactionId);
}
@ -337,7 +337,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
/**
* lim_process_sta_mlm_add_bss_rsp_ft() - Handle the ADD BSS response
* @pMac: Global MAC context
* @mac: Global MAC context
* @limMsgQ: ADD BSS Parameters
* @psessionEntry: PE Session
*
@ -346,7 +346,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
*
*Return: None
*/
void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ, tpPESession psessionEntry)
{
tLimMlmReassocCnf mlmReassocCnf; /* keep sme */
@ -367,13 +367,13 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
goto end;
}
pStaDs = dph_add_hash_entry(pMac, pAddBssParams->bssId,
pStaDs = dph_add_hash_entry(mac, pAddBssParams->bssId,
DPH_STA_HASH_INDEX_PEER,
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
/* Could not add hash table entry */
pe_err("could not add hash entry at DPH for");
lim_print_mac_addr(pMac, pAddBssParams->staContext.staMac,
lim_print_mac_addr(mac, pAddBssParams->staContext.staMac,
LOGE);
goto end;
}
@ -382,14 +382,14 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (psessionEntry->bRoamSynchInProgress != true) {
#endif
pMac->lim.limTimers.gLimReassocFailureTimer.sessionId =
mac->lim.limTimers.gLimReassocFailureTimer.sessionId =
psessionEntry->peSessionId;
/* / Start reassociation failure timer */
MTRACE(mac_trace
(pMac, TRACE_CODE_TIMER_ACTIVATE,
(mac, TRACE_CODE_TIMER_ACTIVATE,
psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER));
if (tx_timer_activate
(&pMac->lim.limTimers.gLimReassocFailureTimer)
(&mac->lim.limTimers.gLimReassocFailureTimer)
!= TX_SUCCESS) {
/* / Could not start reassoc failure timer. */
/* Log error */
@ -402,20 +402,20 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
eSIR_MAC_UNSPEC_FAILURE_STATUS;
goto end;
}
pMac->lim.pSessionEntry = psessionEntry;
if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) {
mac->lim.pSessionEntry = psessionEntry;
if (NULL == mac->lim.pSessionEntry->pLimMlmReassocRetryReq) {
/* Take a copy of reassoc request for retrying */
pMac->lim.pSessionEntry->pLimMlmReassocRetryReq =
mac->lim.pSessionEntry->pLimMlmReassocRetryReq =
qdf_mem_malloc(sizeof(tLimMlmReassocReq));
if (!pMac->lim.pSessionEntry->pLimMlmReassocRetryReq)
if (!mac->lim.pSessionEntry->pLimMlmReassocRetryReq)
goto end;
qdf_mem_copy(pMac->lim.pSessionEntry->
qdf_mem_copy(mac->lim.pSessionEntry->
pLimMlmReassocRetryReq,
psessionEntry->pLimMlmReassocReq,
sizeof(tLimMlmReassocReq));
}
pMac->lim.reAssocRetryAttempt = 0;
lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac,
mac->lim.reAssocRetryAttempt = 0;
lim_send_reassoc_req_with_ft_ies_mgmt_frame(mac,
psessionEntry->
pLimMlmReassocReq,
psessionEntry);
@ -427,7 +427,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
psessionEntry->limPrevMlmState = psessionEntry->limMlmState;
psessionEntry->limMlmState = eLIM_MLM_WT_FT_REASSOC_RSP_STATE;
MTRACE(mac_trace
(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
eLIM_MLM_WT_FT_REASSOC_RSP_STATE));
pe_debug("Set the mlm state: %d session: %d",
psessionEntry->limMlmState, psessionEntry->peSessionId);
@ -439,7 +439,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
/* STA Index(genr by HAL) for the BSS entry is stored here */
pStaDs->staIndex = pAddBssParams->staContext.staIdx;
rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower,
rrm_cache_mgmt_tx_power(mac, pAddBssParams->txMgmtPower,
psessionEntry);
pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams));
@ -471,7 +471,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
pAddStaParams->shortPreambleSupported =
(uint8_t) psessionEntry->beaconParams.fShortPreamble;
lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL,
lim_populate_peer_rate_set(mac, &pAddStaParams->supportedRates, NULL,
false, psessionEntry, NULL, NULL);
if (psessionEntry->htCapability) {
@ -479,44 +479,44 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
pAddStaParams->vhtCapable = psessionEntry->vhtCapability;
pAddStaParams->ch_width = psessionEntry->ch_width;
pAddStaParams->greenFieldCapable =
lim_get_ht_capability(pMac, eHT_GREENFIELD,
lim_get_ht_capability(mac, eHT_GREENFIELD,
psessionEntry);
pAddStaParams->mimoPS =
lim_get_ht_capability(pMac, eHT_MIMO_POWER_SAVE,
lim_get_ht_capability(mac, eHT_MIMO_POWER_SAVE,
psessionEntry);
pAddStaParams->rifsMode =
lim_get_ht_capability(pMac, eHT_RIFS_MODE,
lim_get_ht_capability(mac, eHT_RIFS_MODE,
psessionEntry);
pAddStaParams->lsigTxopProtection =
lim_get_ht_capability(pMac, eHT_LSIG_TXOP_PROTECTION,
lim_get_ht_capability(mac, eHT_LSIG_TXOP_PROTECTION,
psessionEntry);
pAddStaParams->maxAmpduDensity =
lim_get_ht_capability(pMac, eHT_MPDU_DENSITY,
lim_get_ht_capability(mac, eHT_MPDU_DENSITY,
psessionEntry);
pAddStaParams->maxAmpduSize =
lim_get_ht_capability(pMac, eHT_MAX_RX_AMPDU_FACTOR,
lim_get_ht_capability(mac, eHT_MAX_RX_AMPDU_FACTOR,
psessionEntry);
pAddStaParams->maxAmsduSize =
lim_get_ht_capability(pMac, eHT_MAX_AMSDU_LENGTH,
lim_get_ht_capability(mac, eHT_MAX_AMSDU_LENGTH,
psessionEntry);
pAddStaParams->max_amsdu_num =
lim_get_ht_capability(pMac, eHT_MAX_AMSDU_NUM,
lim_get_ht_capability(mac, eHT_MAX_AMSDU_NUM,
psessionEntry);
pAddStaParams->fDsssCckMode40Mhz =
lim_get_ht_capability(pMac, eHT_DSSS_CCK_MODE_40MHZ,
lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
psessionEntry);
pAddStaParams->fShortGI20Mhz =
lim_get_ht_capability(pMac, eHT_SHORT_GI_20MHZ,
lim_get_ht_capability(mac, eHT_SHORT_GI_20MHZ,
psessionEntry);
pAddStaParams->fShortGI40Mhz =
lim_get_ht_capability(pMac, eHT_SHORT_GI_40MHZ,
lim_get_ht_capability(mac, eHT_SHORT_GI_40MHZ,
psessionEntry);
}
listenInterval = pMac->mlme_cfg->sap_cfg.listen_interval;
listenInterval = mac->mlme_cfg->sap_cfg.listen_interval;
pAddStaParams->listenInterval = (uint16_t) listenInterval;
wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode);
wlan_cfg_get_int(mac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode);
pAddStaParams->encryptType = psessionEntry->encryptType;
pAddStaParams->maxTxPower = psessionEntry->maxTxPower;
@ -531,7 +531,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
if (psessionEntry->bRoamSynchInProgress) {
pe_debug("LFR3:Prep and save AddStaReq for post-assoc-rsp");
lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp,
lim_process_assoc_rsp_frame(mac, mac->roam.pReassocResp,
LIM_REASSOC, psessionEntry);
}
#endif
@ -559,11 +559,11 @@ end:
else
mlmReassocCnf.sessionId = 0;
lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF,
lim_post_sme_message(mac, LIM_MLM_REASSOC_CNF,
(uint32_t *) &mlmReassocCnf);
}
void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
tLimMlmReassocReq *reassoc_req)
{
uint8_t chanNum = 0;
@ -579,7 +579,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
return;
}
session = pe_find_session_by_session_id(pMac, reassoc_req->sessionId);
session = pe_find_session_by_session_id(mac, reassoc_req->sessionId);
if (!session) {
pe_err("session Does not exist for given session Id");
qdf_mem_free(reassoc_req);
@ -589,7 +589,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
chanNum = session->currentOperChannel;
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOCIATING,
lim_diag_event_report(mac, WLAN_PE_DIAG_REASSOCIATING,
session, 0, 0);
#endif
@ -608,7 +608,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
qdf_mem_copy(reassoc_req->peerMacAddr,
session->bssId, sizeof(tSirMacAddr));
if (cfg_get_capability_info(pMac, &caps, session) !=
if (cfg_get_capability_info(mac, &caps, session) !=
QDF_STATUS_SUCCESS) {
/**
* Could not get Capabilities value
@ -619,7 +619,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
return;
}
lim_update_caps_info_for_bss(pMac, &caps,
lim_update_caps_info_for_bss(mac, &caps,
session->pLimReAssocReq->bssDescription.capabilityInfo);
pe_debug("Capabilities info FT Reassoc: 0x%X", caps);
@ -628,14 +628,14 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
/* If telescopic beaconing is enabled, set listen interval
to CFG_TELE_BCN_MAX_LI
*/
teleBcnEn = pMac->mlme_cfg->sap_cfg.tele_bcn_wakeup_en;
teleBcnEn = mac->mlme_cfg->sap_cfg.tele_bcn_wakeup_en;
if (teleBcnEn)
val = pMac->mlme_cfg->sap_cfg.tele_bcn_max_li;
val = mac->mlme_cfg->sap_cfg.tele_bcn_max_li;
else
val = pMac->mlme_cfg->sap_cfg.listen_interval;
val = mac->mlme_cfg->sap_cfg.listen_interval;
if (lim_set_link_state
(pMac, eSIR_LINK_PREASSOC_STATE, session->bssId,
(mac, eSIR_LINK_PREASSOC_STATE, session->bssId,
session->selfMacAddr, NULL, NULL) != QDF_STATUS_SUCCESS) {
qdf_mem_free(reassoc_req);
return;
@ -645,7 +645,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
session->pLimMlmReassocReq = reassoc_req;
/* we need to defer the message until we get response back from HAL */
SET_LIM_PROCESS_DEFD_MESGS(pMac, false);
SET_LIM_PROCESS_DEFD_MESGS(mac, false);
msgQ.type = SIR_HAL_ADD_BSS_REQ;
msgQ.reserved = 0;
@ -653,8 +653,8 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac,
msgQ.bodyval = 0;
pe_debug("Sending SIR_HAL_ADD_BSS_REQ");
MTRACE(mac_trace_msg_tx(pMac, session->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
MTRACE(mac_trace_msg_tx(mac, session->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(mac, &msgQ);
if (QDF_STATUS_SUCCESS != retCode) {
qdf_mem_free(session->ftPEContext.pAddBssReq);
pe_err("Posting ADD_BSS_REQ to HAL failed, reason: %X",

View file

@ -43,7 +43,7 @@
void
lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
lim_send_sme_probe_req_ind(tpAniSirGlobal mac,
tSirMacAddr peerMacAddr,
uint8_t *pProbeReqIE,
uint32_t ProbeReqIELen, tpPESession psessionEntry);
@ -103,7 +103,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr,
/**
* lim_remove_timeout_pbc_sessions() - remove pbc probe req entries.
* @pMac - Pointer to Global MAC structure
* @mac - Pointer to Global MAC structure
* @pbc - The beginning entry in WPS PBC probe request link list
*
* This function is called to remove the WPS PBC probe request entries from
@ -111,7 +111,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr,
*
* Return - None
*/
static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac,
static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal mac,
tSirWPSPBCSession *pbc)
{
tSirWPSPBCSession *prev;
@ -173,7 +173,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param addr A pointer to probe request source MAC address
* @param uuid_e A pointer to UUIDE element of WPS IE
* @param psessionEntry A pointer to station PE session
@ -181,7 +181,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac,
* @return None
*/
static void lim_update_pbc_session_entry(tpAniSirGlobal pMac,
static void lim_update_pbc_session_entry(tpAniSirGlobal mac,
uint8_t *addr, uint8_t *uuid_e,
tpPESession psessionEntry)
{
@ -240,7 +240,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac,
while (pbc) {
if (curTime > pbc->timestamp + SIR_WPS_PBC_WALK_TIME) {
prev->next = NULL;
lim_remove_timeout_pbc_sessions(pMac, pbc);
lim_remove_timeout_pbc_sessions(mac, pbc);
break;
}
prev = pbc;
@ -262,16 +262,16 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param psessionEntry A pointer to station PE session
*
* @return None
*/
void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry)
void lim_wpspbc_close(tpAniSirGlobal mac, tpPESession psessionEntry)
{
lim_remove_timeout_pbc_sessions(pMac, psessionEntry->pAPWPSPBCSession);
lim_remove_timeout_pbc_sessions(mac, psessionEntry->pAPWPSPBCSession);
}
@ -524,7 +524,7 @@ multipleSSIDcheck:
* This function processes received Probe Request frame and Pass
* Probe Request Frame to HDD.
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param *pBd A pointer to Buffer descriptor + associated PDUs
* @param psessionEntry A pointer to PE session
*
@ -532,7 +532,7 @@ multipleSSIDcheck:
*/
static void
lim_indicate_probe_req_to_hdd(tpAniSirGlobal pMac, uint8_t *pBd,
lim_indicate_probe_req_to_hdd(tpAniSirGlobal mac, uint8_t *pBd,
tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
@ -544,7 +544,7 @@ lim_indicate_probe_req_to_hdd(tpAniSirGlobal pMac, uint8_t *pBd,
frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd);
/* send the probe req to SME. */
lim_send_sme_mgmt_frame_ind(pMac, pHdr->fc.subType,
lim_send_sme_mgmt_frame_ind(mac, pHdr->fc.subType,
(uint8_t *) pHdr,
(frameLen + sizeof(tSirMacMgmtHdr)),
psessionEntry->smeSessionId, WMA_GET_RX_CH(pBd),
@ -623,7 +623,7 @@ lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal mac_ctx,
* @return None
*/
void
lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
lim_send_sme_probe_req_ind(tpAniSirGlobal mac,
tSirMacAddr peerMacAddr,
uint8_t *pProbeReqIE,
uint32_t ProbeReqIELen, tpPESession psessionEntry)
@ -648,7 +648,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
qdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes,
peerMacAddr, QDF_MAC_ADDR_SIZE);
MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG,
MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
psessionEntry->peSessionId, msgQ.type));
if (ProbeReqIELen > sizeof(pSirSmeProbeReqInd->WPSPBCProbeReq.
@ -662,7 +662,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
qdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIE, pProbeReqIE,
ProbeReqIELen);
if (lim_sys_process_mmh_msg_api(pMac, &msgQ, ePROT) != QDF_STATUS_SUCCESS)
if (lim_sys_process_mmh_msg_api(mac, &msgQ, ePROT) != QDF_STATUS_SUCCESS)
pe_err("couldnt send the probe req to hdd");
} /*** end lim_send_sme_probe_req_ind() ***/

View file

@ -436,7 +436,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
*
***NOTE:
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @return The corresponding HT enumeration
*/
ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode)

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2014, 2016, 2018 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -35,7 +35,7 @@
void limQuietBss(tpAniSirGlobal, uint32_t);
void lim_cleanupMeasData(tpAniSirGlobal);
void limDeleteMeasTimers(tpAniSirGlobal);
void limStopMeasTimers(tpAniSirGlobal pMac);
void limStopMeasTimers(tpAniSirGlobal mac);
void lim_cleanupMeasResources(tpAniSirGlobal);
void limRestorePreLearnState(tpAniSirGlobal);
void limCollectMeasurementData(tpAniSirGlobal, uint32_t *, tpSchBeaconStruct);

View file

@ -49,7 +49,7 @@
/**
* lim_update_re_assoc_globals() - Update reassoc global data
* @pMac: Global MAC context
* @mac: Global MAC context
* @pAssocRsp: Reassociation response data
* @psessionEntry: PE Session
*
@ -58,7 +58,7 @@
* Return: None
*/
void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
void lim_update_re_assoc_globals(tpAniSirGlobal mac, tpSirAssocRsp pAssocRsp,
tpPESession psessionEntry)
{
/* Update the current Bss Information */
@ -86,14 +86,14 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
/** Set the State Back to ReAssoc Rsp*/
psessionEntry->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE;
MTRACE(mac_trace
(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
psessionEntry->limMlmState));
}
/**
* @lim_handle_del_bss_in_re_assoc_context() - DEL BSS during reassociation
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @pStaDs: Station Hash entry
* @psessionEntry: PE Session
*
@ -108,7 +108,7 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
*
* Return: None
*/
void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal mac,
tpDphHashNode pStaDs, tpPESession psessionEntry)
{
tLimMlmReassocCnf mlmReassocCnf;
@ -134,25 +134,25 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
eSIR_SME_RESOURCES_UNAVAILABLE;
mlmReassocCnf.protStatusCode =
eSIR_MAC_UNSPEC_FAILURE_STATUS;
lim_delete_dph_hash_entry(pMac, psessionEntry->bssId,
lim_delete_dph_hash_entry(mac, psessionEntry->bssId,
DPH_STA_HASH_INDEX_PEER, psessionEntry);
goto error;
}
/* Delete the older STA Table entry */
lim_delete_dph_hash_entry(pMac, psessionEntry->bssId,
lim_delete_dph_hash_entry(mac, psessionEntry->bssId,
DPH_STA_HASH_INDEX_PEER, psessionEntry);
/*
* Add an entry for AP to hash table
* maintained by DPH module
*/
pStaDs = dph_add_hash_entry(pMac,
pStaDs = dph_add_hash_entry(mac,
psessionEntry->limReAssocbssId,
DPH_STA_HASH_INDEX_PEER,
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
/* Could not add hash table entry */
pe_err("could not add hash entry at DPH for");
lim_print_mac_addr(pMac,
lim_print_mac_addr(mac,
psessionEntry->limReAssocbssId, LOGE);
mlmReassocCnf.resultCode =
eSIR_SME_RESOURCES_UNAVAILABLE;
@ -166,17 +166,17 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
*/
assocRsp =
(tpSirAssocRsp) psessionEntry->limAssocResponseData;
lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp,
lim_update_assoc_sta_datas(mac, pStaDs, assocRsp,
psessionEntry);
lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry);
lim_update_re_assoc_globals(mac, assocRsp, psessionEntry);
bss_desc = &psessionEntry->pLimReAssocReq->bssDescription;
lim_extract_ap_capabilities(pMac,
lim_extract_ap_capabilities(mac,
(uint8_t *) bss_desc->ieFields,
lim_get_ielen_from_bss_description(bss_desc),
beacon_struct);
if (pMac->lim.gLimProtectionControl !=
if (mac->lim.gLimProtectionControl !=
MLME_FORCE_POLICY_PROTECTION_DISABLE)
lim_decide_sta_protection_on_assoc(pMac,
lim_decide_sta_protection_on_assoc(mac,
beacon_struct,
psessionEntry);
if (beacon_struct->erpPresent) {
@ -190,7 +190,7 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
* deleting the existing BSS and then adding a new one
*/
if (QDF_STATUS_SUCCESS !=
lim_sta_send_add_bss(pMac, assocRsp, beacon_struct,
lim_sta_send_add_bss(mac, assocRsp, beacon_struct,
bss_desc,
false, psessionEntry)) {
pe_err("Posting ADDBSS in the ReAssocCtx Failed");
@ -202,7 +202,7 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
mlmReassocCnf.protStatusCode =
eSIR_MAC_UNSPEC_FAILURE_STATUS;
qdf_mem_free(assocRsp);
pMac->lim.gLimAssocResponseData = NULL;
mac->lim.gLimAssocResponseData = NULL;
qdf_mem_free(beacon_struct);
goto error;
}
@ -220,13 +220,13 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac,
}
return;
error:
lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF,
lim_post_sme_message(mac, LIM_MLM_REASSOC_CNF,
(uint32_t *) &mlmReassocCnf);
}
/**
* @lim_handle_add_bss_in_re_assoc_context() - ADD BSS during reassociation
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @pStaDs: Station Hash entry
* @psessionEntry: PE Session
*
@ -241,7 +241,7 @@ error:
*
* Return: None
*/
void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal mac,
tpDphHashNode pStaDs, tpPESession psessionEntry)
{
tLimMlmReassocCnf mlmReassocCnf;
@ -249,7 +249,7 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
/** Set the MlmState to IDLE*/
psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE;
MTRACE(mac_trace
(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
psessionEntry->limMlmState));
switch (psessionEntry->limSmeState) {
case eLIM_SME_WT_REASSOC_STATE: {
@ -269,7 +269,7 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
}
/* Get the AP entry from DPH hash table */
pStaDs =
dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER,
dph_get_hash_entry(mac, DPH_STA_HASH_INDEX_PEER,
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
pe_err("Fail to get STA PEER entry from hash");
@ -285,10 +285,10 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
*/
assocRsp =
(tpSirAssocRsp) psessionEntry->limAssocResponseData;
lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp,
lim_update_assoc_sta_datas(mac, pStaDs, assocRsp,
psessionEntry);
lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry);
lim_extract_ap_capabilities(pMac,
lim_update_re_assoc_globals(mac, assocRsp, psessionEntry);
lim_extract_ap_capabilities(mac,
(uint8_t *) psessionEntry->
pLimReAssocReq->bssDescription.
ieFields,
@ -297,9 +297,9 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
pLimReAssocReq->
bssDescription),
pBeaconStruct);
if (pMac->lim.gLimProtectionControl !=
if (mac->lim.gLimProtectionControl !=
MLME_FORCE_POLICY_PROTECTION_DISABLE)
lim_decide_sta_protection_on_assoc(pMac,
lim_decide_sta_protection_on_assoc(mac,
pBeaconStruct,
psessionEntry);
@ -314,7 +314,7 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
psessionEntry->isNonRoamReassoc = 1;
if (QDF_STATUS_SUCCESS !=
lim_sta_send_add_bss(pMac, assocRsp, pBeaconStruct,
lim_sta_send_add_bss(mac, assocRsp, pBeaconStruct,
&psessionEntry->pLimReAssocReq->
bssDescription, true,
psessionEntry)) {
@ -327,7 +327,7 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
mlmReassocCnf.protStatusCode =
eSIR_MAC_UNSPEC_FAILURE_STATUS;
qdf_mem_free(assocRsp);
pMac->lim.gLimAssocResponseData = NULL;
mac->lim.gLimAssocResponseData = NULL;
qdf_mem_free(pBeaconStruct);
goto Error;
}
@ -345,19 +345,19 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac,
}
return;
Error:
lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF,
lim_post_sme_message(mac, LIM_MLM_REASSOC_CNF,
(uint32_t *) &mlmReassocCnf);
}
/**
* lim_is_reassoc_in_progress() - Check if reassoiciation is in progress
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @psessionEntry: PE Session
*
* Return: true When STA is waiting for Reassoc response from AP
* else false
*/
bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry)
bool lim_is_reassoc_in_progress(tpAniSirGlobal mac, tpPESession psessionEntry)
{
if (psessionEntry == NULL)
return false;
@ -424,7 +424,7 @@ QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
/**
* lim_restore_pre_reassoc_state() - Restore the pre-association context
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @resultCode: Assoc response result
* @protStatusCode: Internal protocol status code
* @psessionEntry: PE Session
@ -438,7 +438,7 @@ QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
*/
void
lim_restore_pre_reassoc_state(tpAniSirGlobal pMac,
lim_restore_pre_reassoc_state(tpAniSirGlobal mac,
tSirResultCodes resultCode, uint16_t protStatusCode,
tpPESession psessionEntry)
{
@ -449,13 +449,13 @@ lim_restore_pre_reassoc_state(tpAniSirGlobal pMac,
psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
MTRACE(mac_trace
(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
eLIM_MLM_LINK_ESTABLISHED_STATE));
/* 'Change' timer for future activations */
lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER);
lim_deactivate_and_change_timer(mac, eLIM_REASSOC_FAIL_TIMER);
lim_set_channel(pMac, psessionEntry->currentOperChannel,
lim_set_channel(mac, psessionEntry->currentOperChannel,
psessionEntry->ch_center_freq_seg0,
psessionEntry->ch_center_freq_seg1,
psessionEntry->ch_width,
@ -468,20 +468,20 @@ lim_restore_pre_reassoc_state(tpAniSirGlobal pMac,
mlmReassocCnf.resultCode = resultCode;
mlmReassocCnf.protStatusCode = protStatusCode;
mlmReassocCnf.sessionId = psessionEntry->peSessionId;
lim_post_sme_message(pMac,
lim_post_sme_message(mac,
LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf);
}
/**
* lim_post_reassoc_failure() - Post failure message to SME
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @resultCode: Result Code
* @protStatusCode: Protocol Status Code
* @psessionEntry: PE Session
*
* Return: None
*/
void lim_post_reassoc_failure(tpAniSirGlobal pMac,
void lim_post_reassoc_failure(tpAniSirGlobal mac,
tSirResultCodes resultCode, uint16_t protStatusCode,
tpPESession psessionEntry)
{
@ -489,15 +489,15 @@ void lim_post_reassoc_failure(tpAniSirGlobal pMac,
psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
MTRACE(mac_trace
(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
(mac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
eLIM_MLM_LINK_ESTABLISHED_STATE));
lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER);
lim_deactivate_and_change_timer(mac, eLIM_REASSOC_FAIL_TIMER);
mlmReassocCnf.resultCode = resultCode;
mlmReassocCnf.protStatusCode = protStatusCode;
mlmReassocCnf.sessionId = psessionEntry->peSessionId;
lim_post_sme_message(pMac,
lim_post_sme_message(mac,
LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf);
}

View file

@ -52,7 +52,7 @@
***NOTE:
* NA
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param pBPR - Pointer to parsed Beacon/Probe Response structure
* @param pRxPacketInfo - Pointer to Received frame's BD
* @param fScanning - flag to indicate if it is during scan.
@ -61,7 +61,7 @@
* @return None
*/
void
lim_collect_bss_description(tpAniSirGlobal pMac,
lim_collect_bss_description(tpAniSirGlobal mac,
tSirBssDescription *pBssDescr,
tpSirProbeRespBeacon pBPR,
uint8_t *pRxPacketInfo, uint8_t fScanning)
@ -131,7 +131,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
* This fix will work for 5Ghz 11n devices, but for 11a devices, we have to rely on RXP routing flag to get the correct channel.
* So The problem of incorrect channel reporting in 5Ghz will still remain for 11a devices.
*/
pBssDescr->channelId = lim_get_channel_from_beacon(pMac, pBPR);
pBssDescr->channelId = lim_get_channel_from_beacon(mac, pBPR);
pBssDescr->channelIdSelf = pBssDescr->channelId;
pBssDescr->rx_channel = rxChannel;
@ -139,7 +139,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
/* set the network type in bss description */
channelNum = pBssDescr->channelId;
pBssDescr->nwType =
lim_get_nw_type(pMac, channelNum, SIR_MAC_MGMT_FRAME, pBPR);
lim_get_nw_type(mac, channelNum, SIR_MAC_MGMT_FRAME, pBPR);
/* Copy RSSI & SINR from BD */
pBssDescr->rssi = (int8_t) WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo);
@ -162,7 +162,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
pBPR->ssId.length, pBPR->ssId.ssId, pBssDescr->rssi_raw);
if (fScanning) {
rrm_get_start_tsf(pMac, pBssDescr->startTSF);
rrm_get_start_tsf(mac, pBssDescr->startTSF);
pBssDescr->parentTSF = WMA_GET_RX_TIMESTAMP(pRxPacketInfo);
}
@ -194,7 +194,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
/*set channel number in beacon in case it is not present */
pBPR->channelNumber = pBssDescr->channelId;
pMac->lim.beacon_probe_rsp_cnt_per_scan++;
mac->lim.beacon_probe_rsp_cnt_per_scan++;
return;
} /*** end lim_collect_bss_description() ***/

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012, 2014-2018 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -35,7 +35,7 @@
uint8_t lim_scan_hash_function(tSirMacAddr);
void lim_restore_pre_scan_state(tpAniSirGlobal);
void lim_copy_scan_result(tpAniSirGlobal, uint8_t *);
void lim_collect_bss_description(tpAniSirGlobal pMac,
void lim_collect_bss_description(tpAniSirGlobal mac,
tSirBssDescription *pBssDescr,
tpSirProbeRespBeacon pBPR,
uint8_t *pRxPacketInfo, uint8_t fScanning);

View file

@ -469,13 +469,13 @@ err:
/**
* lim_send_retry_reassoc_req_frame() - Retry for reassociation
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @pMlmReassocReq: Request buffer to be sent
* @psessionEntry: PE Session
*
* Return: None
*/
void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac,
void lim_send_retry_reassoc_req_frame(tpAniSirGlobal mac,
tLimMlmReassocReq *pMlmReassocReq,
tpPESession psessionEntry)
{
@ -491,12 +491,12 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac,
}
/* Prepare and send Reassociation request frame */
/* start reassoc timer. */
pMac->lim.limTimers.gLimReassocFailureTimer.sessionId =
mac->lim.limTimers.gLimReassocFailureTimer.sessionId =
psessionEntry->peSessionId;
/* Start reassociation failure timer */
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE,
psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer)
if (tx_timer_activate(&mac->lim.limTimers.gLimReassocFailureTimer)
!= TX_SUCCESS) {
/* Could not start reassoc failure timer. */
/* Log error */
@ -508,7 +508,7 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac,
goto end;
}
lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac, pTmpMlmReassocReq,
lim_send_reassoc_req_with_ft_ies_mgmt_frame(mac, pTmpMlmReassocReq,
psessionEntry);
return;
@ -527,19 +527,19 @@ end:
/* Update PE sessio Id */
mlmReassocCnf.sessionId = psessionEntry->peSessionId;
lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF,
lim_post_sme_message(mac, LIM_MLM_REASSOC_CNF,
(uint32_t *) &mlmReassocCnf);
}
/**
* lim_send_reassoc_req_mgmt_frame() - Send the reassociation frame
* @pMac: Global MAC Context
* @mac: Global MAC Context
* @pMlmReassocReq: Reassociation request buffer to be sent
* @psessionEntry: PE Session
*
* Return: None
*/
void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal mac,
tLimMlmReassocReq *pMlmReassocReq,
tpPESession psessionEntry)
{
@ -595,8 +595,8 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
qdf_mem_copy((uint8_t *) frm->CurrentAPAddress.mac,
(uint8_t *) psessionEntry->bssId, 6);
populate_dot11f_ssid2(pMac, &frm->SSID);
populate_dot11f_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
populate_dot11f_ssid2(mac, &frm->SSID);
populate_dot11f_supp_rates(mac, POPULATE_DOT11F_RATES_OPERATIONAL,
&frm->SuppRates, psessionEntry);
fQosEnabled = (psessionEntry->limQosEnabled) &&
@ -611,30 +611,30 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
if (psessionEntry->lim11hEnable &&
psessionEntry->pLimReAssocReq->spectrumMgtIndicator == true) {
PowerCapsPopulated = true;
populate_dot11f_power_caps(pMac, &frm->PowerCaps, LIM_REASSOC,
populate_dot11f_power_caps(mac, &frm->PowerCaps, LIM_REASSOC,
psessionEntry);
populate_dot11f_supp_channels(pMac, &frm->SuppChannels,
populate_dot11f_supp_channels(mac, &frm->SuppChannels,
LIM_REASSOC, psessionEntry);
}
if (pMac->rrm.rrmPEContext.rrmEnable &&
if (mac->rrm.rrmPEContext.rrmEnable &&
SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) {
if (PowerCapsPopulated == false) {
PowerCapsPopulated = true;
populate_dot11f_power_caps(pMac, &frm->PowerCaps,
populate_dot11f_power_caps(mac, &frm->PowerCaps,
LIM_REASSOC, psessionEntry);
}
}
if (fQosEnabled)
populate_dot11f_qos_caps_station(pMac, psessionEntry,
populate_dot11f_qos_caps_station(mac, psessionEntry,
&frm->QOSCapsStation);
populate_dot11f_ext_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
populate_dot11f_ext_supp_rates(mac, POPULATE_DOT11F_RATES_OPERATIONAL,
&frm->ExtSuppRates, psessionEntry);
if (pMac->rrm.rrmPEContext.rrmEnable &&
if (mac->rrm.rrmPEContext.rrmEnable &&
SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps))
populate_dot11f_rrm_ie(pMac, &frm->RRMEnabledCap, psessionEntry);
populate_dot11f_rrm_ie(mac, &frm->RRMEnabledCap, psessionEntry);
/* The join request *should* contain zero or one of the WPA and RSN */
/* IEs. The payload send along with the request is a */
/* 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': */
@ -656,23 +656,23 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
/* enrollment, and we've been configured to indicate that by */
/* eliding the WPA or RSN IE, we just skip this: */
if (nAddIELen && pAddIE)
wpsIe = limGetWscIEPtr(pMac, pAddIE, nAddIELen);
wpsIe = limGetWscIEPtr(mac, pAddIE, nAddIELen);
if (NULL == wpsIe) {
populate_dot11f_rsn_opaque(pMac,
populate_dot11f_rsn_opaque(mac,
&(psessionEntry->pLimReAssocReq->rsnIE),
&frm->RSNOpaque);
populate_dot11f_wpa_opaque(pMac,
populate_dot11f_wpa_opaque(mac,
&(psessionEntry->pLimReAssocReq->rsnIE),
&frm->WPAOpaque);
#if defined(FEATURE_WLAN_WAPI)
populate_dot11f_wapi_opaque(pMac,
populate_dot11f_wapi_opaque(mac,
&(psessionEntry->pLimReAssocReq->
rsnIE), &frm->WAPIOpaque);
#endif /* defined(FEATURE_WLAN_WAPI) */
}
/* include WME EDCA IE as well */
if (fWmeEnabled) {
populate_dot11f_wmm_info_station_per_session(pMac,
populate_dot11f_wmm_info_station_per_session(mac,
psessionEntry, &frm->WMMInfoStation);
if (fWsmEnabled)
@ -680,25 +680,25 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
}
if (psessionEntry->htCapability &&
pMac->lim.htCapabilityPresentInBeacon) {
populate_dot11f_ht_caps(pMac, psessionEntry, &frm->HTCaps);
mac->lim.htCapabilityPresentInBeacon) {
populate_dot11f_ht_caps(mac, psessionEntry, &frm->HTCaps);
}
if (psessionEntry->vhtCapability &&
psessionEntry->vhtCapabilityPresentInBeacon) {
pe_warn("Populate VHT IEs in Re-Assoc Request");
populate_dot11f_vht_caps(pMac, psessionEntry, &frm->VHTCaps);
populate_dot11f_vht_caps(mac, psessionEntry, &frm->VHTCaps);
isVHTEnabled = true;
}
populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm->ExtCap, psessionEntry);
populate_dot11f_ext_cap(mac, isVHTEnabled, &frm->ExtCap, psessionEntry);
if (lim_is_session_he_capable(psessionEntry)) {
pe_debug("Populate HE IEs");
populate_dot11f_he_caps(pMac, psessionEntry,
populate_dot11f_he_caps(mac, psessionEntry,
&frm->he_cap);
}
nStatus =
dot11f_get_packed_re_assoc_request_size(pMac, frm, &nPayload);
dot11f_get_packed_re_assoc_request_size(mac, frm, &nPayload);
if (DOT11F_FAILED(nStatus)) {
pe_err("Fail to get size:ReassocReq: (0x%08x)", nStatus);
/* We'll fall back on the worst case scenario: */
@ -724,13 +724,13 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
qdf_mem_set(pFrame, nBytes, 0);
/* Next, we fill out the buffer descriptor: */
lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME,
lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME,
SIR_MAC_MGMT_REASSOC_REQ, psessionEntry->limReAssocbssId,
psessionEntry->selfMacAddr);
pMacHdr = (tpSirMacMgmtHdr) pFrame;
/* That done, pack the Probe Request: */
nStatus = dot11f_pack_re_assoc_request(pMac, frm, pFrame +
nStatus = dot11f_pack_re_assoc_request(mac, frm, pFrame +
sizeof(tSirMacMgmtHdr),
nPayload, &nPayload);
if (DOT11F_FAILED(nStatus)) {
@ -775,13 +775,13 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT,
lim_diag_event_report(mac, WLAN_PE_DIAG_REASSOC_START_EVENT,
psessionEntry, QDF_STATUS_SUCCESS, QDF_STATUS_SUCCESS);
lim_diag_mgmt_tx_event_report(pMac, pMacHdr,
lim_diag_mgmt_tx_event_report(mac, pMacHdr,
psessionEntry, QDF_STATUS_SUCCESS,
QDF_STATUS_SUCCESS);
qdf_status =
wma_tx_frame(pMac, pPacket,
wma_tx_frame(mac, pPacket,
(uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, txFlag, smeSessionId, 0,

View file

@ -44,14 +44,14 @@
\ uint16_t messageLength
\ uint8_t sessionId
\ uint16_t transactionId
\param pMac - pMac global structure
\param mac - mac global structure
\param *pBuf - pointer to the message buffer
\param sessionId - returned session id value
\param transactionId - returned transaction ID value
\return None
------------------------------------------------------------------*/
void
lim_get_session_info(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *sessionId,
lim_get_session_info(tpAniSirGlobal mac, uint8_t *pBuf, uint8_t *sessionId,
uint16_t *transactionId)
{
if (!pBuf) {

View file

@ -37,7 +37,7 @@
#include "lim_types.h"
#include "lim_prop_exts_utils.h"
void lim_get_session_info(tpAniSirGlobal pMac, uint8_t *,
void lim_get_session_info(tpAniSirGlobal mac, uint8_t *,
uint8_t *, uint16_t *);
/* Byte String <--> uint16_t/uint32_t copy functions */

View file

@ -88,7 +88,7 @@ struct sDphHashNode *pe_get_session_dph_node_array(uint8_t session_id)
--------------------------------------------------------------------------*/
static void pe_init_beacon_params(tpAniSirGlobal pMac,
static void pe_init_beacon_params(tpAniSirGlobal mac,
tpPESession psessionEntry)
{
psessionEntry->beaconParams.beaconInterval = 0;
@ -558,7 +558,7 @@ void lim_update_bcn_probe_filter(tpAniSirGlobal mac_ctx,
filter->num_sap_sessions);
}
tpPESession pe_create_session(tpAniSirGlobal pMac,
tpPESession pe_create_session(tpAniSirGlobal mac,
uint8_t *bssid,
uint8_t *sessionId,
uint16_t numSta, tSirBssType bssType,
@ -569,19 +569,19 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
tpPESession session_ptr;
struct wlan_objmgr_vdev *vdev;
for (i = 0; i < pMac->lim.maxBssId; i++) {
for (i = 0; i < mac->lim.maxBssId; i++) {
/* Find first free room in session table */
if (pMac->lim.gpSession[i].valid == true)
if (mac->lim.gpSession[i].valid == true)
continue;
break;
}
if (i == pMac->lim.maxBssId) {
if (i == mac->lim.maxBssId) {
pe_err("Session can't be created. Reached max sessions");
return NULL;
}
session_ptr = &pMac->lim.gpSession[i];
session_ptr = &mac->lim.gpSession[i];
qdf_mem_set((void *)session_ptr, sizeof(struct pe_session), 0);
/* Allocate space for Station Table for this session. */
session_ptr->dph.dphHashTable.pHashTable =
@ -592,7 +592,7 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
session_ptr->dph.dphHashTable.pDphNodeArray =
pe_get_session_dph_node_array(i);
session_ptr->dph.dphHashTable.size = numSta + 1;
dph_hash_table_class_init(pMac, &session_ptr->dph.dphHashTable);
dph_hash_table_class_init(mac, &session_ptr->dph.dphHashTable);
session_ptr->gpLimPeerIdxpool = qdf_mem_malloc(
sizeof(*(session_ptr->gpLimPeerIdxpool)) *
lim_get_peer_idxpool_size(numSta, bssType));
@ -605,13 +605,13 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
/* Copy the BSSID to the session table */
sir_copy_mac_addr(session_ptr->bssId, bssid);
if (bssType == eSIR_MONITOR_MODE)
sir_copy_mac_addr(pMac->lim.gpSession[i].selfMacAddr, bssid);
sir_copy_mac_addr(mac->lim.gpSession[i].selfMacAddr, bssid);
session_ptr->valid = true;
/* Initialize the SME and MLM states to IDLE */
session_ptr->limMlmState = eLIM_MLM_IDLE_STATE;
session_ptr->limSmeState = eLIM_SME_IDLE_STATE;
session_ptr->limCurrentAuthType = eSIR_OPEN_SYSTEM;
pe_init_beacon_params(pMac, &pMac->lim.gpSession[i]);
pe_init_beacon_params(mac, &mac->lim.gpSession[i]);
session_ptr->is11Rconnection = false;
#ifdef FEATURE_WLAN_ESE
session_ptr->isESEconnection = false;
@ -634,9 +634,9 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
#endif
session_ptr->fWaitForProbeRsp = 0;
session_ptr->fIgnoreCapsChange = 0;
session_ptr->ignore_assoc_disallowed = pMac->ignore_assoc_disallowed;
session_ptr->ignore_assoc_disallowed = mac->ignore_assoc_disallowed;
session_ptr->is_session_obss_color_collision_det_enabled =
pMac->lim.global_obss_color_collision_det_offload;
mac->lim.global_obss_color_collision_det_offload;
pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d",
*sessionId, MAC_ADDR_ARRAY(bssid), numSta);
@ -659,7 +659,7 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
* Get vdev object from soc which automatically increments
* reference count.
*/
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(pMac->psoc,
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac->psoc,
sme_session_id,
WLAN_LEGACY_MAC_ID);
if (!vdev) {
@ -668,13 +668,13 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
}
session_ptr->vdev = vdev;
session_ptr->smeSessionId = sme_session_id;
session_ptr->mac_ctx = pMac;
session_ptr->mac_ctx = mac;
if (eSIR_INFRASTRUCTURE_MODE == bssType)
lim_ft_open(pMac, &pMac->lim.gpSession[i]);
lim_ft_open(mac, &mac->lim.gpSession[i]);
if (eSIR_MONITOR_MODE == bssType)
lim_ft_open(pMac, &pMac->lim.gpSession[i]);
lim_ft_open(mac, &mac->lim.gpSession[i]);
if (eSIR_INFRA_AP_MODE == bssType) {
session_ptr->old_protection_state = 0;
@ -685,7 +685,7 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
protection_fields_reset_timer,
QDF_TIMER_TYPE_SW,
pe_reset_protection_callback,
(void *)&pMac->lim.gpSession[i]);
(void *)&mac->lim.gpSession[i]);
if (QDF_IS_STATUS_ERROR(status))
pe_err("cannot create protection fields reset timer");
@ -695,17 +695,17 @@ tpPESession pe_create_session(tpAniSirGlobal pMac,
status = qdf_mc_timer_init(&session_ptr->ap_ecsa_timer,
QDF_TIMER_TYPE_WAKE_APPS,
lim_process_ap_ecsa_timeout,
(void *)&pMac->lim.gpSession[i]);
(void *)&mac->lim.gpSession[i]);
if (status != QDF_STATUS_SUCCESS)
pe_err("cannot create ap_ecsa_timer");
}
pe_init_fils_info(session_ptr);
pe_init_pmf_comeback_timer(pMac, session_ptr, *sessionId);
pe_init_pmf_comeback_timer(mac, session_ptr, *sessionId);
session_ptr->ht_client_cnt = 0;
/* following is invalid value since seq number is 12 bit */
session_ptr->prev_auth_seq_num = 0xFFFF;
return &pMac->lim.gpSession[i];
return &mac->lim.gpSession[i];
free_session_attrs:
qdf_mem_free(session_ptr->gpLimPeerIdxpool);
@ -736,7 +736,7 @@ free_dp_hash_table:
This function returns the session context and the session ID if the session
corresponding to the given BSSID is found in the PE session table.
\param pMac - pointer to global adapter context
\param mac - pointer to global adapter context
\param bssid - BSSID of the session
\param sessionId -session ID is returned here, if session is found.
@ -744,18 +744,18 @@ free_dp_hash_table:
\sa
--------------------------------------------------------------------------*/
tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid,
tpPESession pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
uint8_t *sessionId)
{
uint8_t i;
for (i = 0; i < pMac->lim.maxBssId; i++) {
for (i = 0; i < mac->lim.maxBssId; i++) {
/* If BSSID matches return corresponding tables address */
if ((pMac->lim.gpSession[i].valid)
&& (sir_compare_mac_addr(pMac->lim.gpSession[i].bssId,
if ((mac->lim.gpSession[i].valid)
&& (sir_compare_mac_addr(mac->lim.gpSession[i].bssId,
bssid))) {
*sessionId = i;
return &pMac->lim.gpSession[i];
return &mac->lim.gpSession[i];
}
}
@ -768,20 +768,20 @@ tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid,
This function returns the session context if the session
corresponding to the given bssIdx is found in the PE session table.
\param pMac - pointer to global adapter context
\param mac - pointer to global adapter context
\param bssIdx - bss index of the session
\return tpPESession - pointer to the session context or NULL if session is not found.
\sa
--------------------------------------------------------------------------*/
tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal pMac, uint8_t bssIdx)
tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx)
{
uint8_t i;
for (i = 0; i < pMac->lim.maxBssId; i++) {
for (i = 0; i < mac->lim.maxBssId; i++) {
/* If BSSID matches return corresponding tables address */
if ((pMac->lim.gpSession[i].valid)
&& (pMac->lim.gpSession[i].bssIdx == bssIdx)) {
return &pMac->lim.gpSession[i];
if ((mac->lim.gpSession[i].valid)
&& (mac->lim.gpSession[i].bssIdx == bssIdx)) {
return &mac->lim.gpSession[i];
}
}
pe_debug("Session lookup fails for bssIdx: %d", bssIdx);
@ -794,23 +794,23 @@ tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal pMac, uint8_t bssIdx)
This function returns the session context if the session
corresponding to the given session ID is found in the PE session table.
\param pMac - pointer to global adapter context
\param mac - pointer to global adapter context
\param sessionId -session ID for which session context needs to be looked up.
\return tpPESession - pointer to the session context or NULL if session is not found.
\sa
--------------------------------------------------------------------------*/
tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac,
tpPESession pe_find_session_by_session_id(tpAniSirGlobal mac,
uint8_t sessionId)
{
if (sessionId >= pMac->lim.maxBssId) {
if (sessionId >= mac->lim.maxBssId) {
pe_err("Invalid sessionId: %d", sessionId);
return NULL;
}
if (pMac->lim.gpSession[sessionId].valid)
return &pMac->lim.gpSession[sessionId];
if (mac->lim.gpSession[sessionId].valid)
return &mac->lim.gpSession[sessionId];
return NULL;
}
@ -1060,7 +1060,7 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session)
This function returns the session context and the session ID if the session
corresponding to the given station address is found in the PE session table.
\param pMac - pointer to global adapter context
\param mac - pointer to global adapter context
\param sa - Peer STA Address of the session
\param sessionId -session ID is returned here, if session is found.
@ -1069,28 +1069,28 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session)
\sa
--------------------------------------------------------------------------*/
tpPESession pe_find_session_by_peer_sta(tpAniSirGlobal pMac, uint8_t *sa,
tpPESession pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
uint8_t *sessionId)
{
uint8_t i;
tpDphHashNode pSta;
uint16_t aid;
for (i = 0; i < pMac->lim.maxBssId; i++) {
if ((pMac->lim.gpSession[i].valid)) {
for (i = 0; i < mac->lim.maxBssId; i++) {
if ((mac->lim.gpSession[i].valid)) {
pSta =
dph_lookup_hash_entry(pMac, sa, &aid,
&pMac->lim.gpSession[i].dph.
dph_lookup_hash_entry(mac, sa, &aid,
&mac->lim.gpSession[i].dph.
dphHashTable);
if (pSta != NULL) {
*sessionId = i;
return &pMac->lim.gpSession[i];
return &mac->lim.gpSession[i];
}
}
}
pe_debug("Session lookup fails for Peer StaId:");
lim_print_mac_addr(pMac, sa, LOGD);
lim_print_mac_addr(mac, sa, LOGD);
return NULL;
}

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2015, 2018 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -19,9 +19,9 @@
#if !defined(__LIM_SESSION_UTILS_H)
#define __LIM_SESSION_UTILS_H
uint8_t is_lim_session_off_channel(tpAniSirGlobal pMac, uint8_t sessionId);
uint8_t lim_is_chan_switch_running(tpAniSirGlobal pMac);
uint8_t lim_is_in_mcc(tpAniSirGlobal pMac);
uint8_t pe_get_current_stas_count(tpAniSirGlobal pMac);
uint8_t is_lim_session_off_channel(tpAniSirGlobal mac, uint8_t sessionId);
uint8_t lim_is_chan_switch_running(tpAniSirGlobal mac);
uint8_t lim_is_in_mcc(tpAniSirGlobal mac);
uint8_t pe_get_current_stas_count(tpAniSirGlobal mac);
#endif /* #if !defined( __LIM_SESSION_UTILS_H ) */

View file

@ -167,13 +167,13 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pWSCie Pointer to received WSC IE
* @return true when WSC IE is valid, false otherwise
*/
static uint8_t
lim_is_addie_valid_in_sme_req_message(tpAniSirGlobal pMac, tpSirAddie pAddie)
lim_is_addie_valid_in_sme_req_message(tpAniSirGlobal mac, tpSirAddie pAddie)
{
int left = pAddie->length;
uint8_t *ptr = pAddie->addIEdata;
@ -336,13 +336,13 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pBssDescr Pointer to received Bss Descritipion
* @return true when BSS description is valid, false otherwise
*/
static uint8_t
lim_is_bss_descr_valid_in_sme_req_message(tpAniSirGlobal pMac,
lim_is_bss_descr_valid_in_sme_req_message(tpAniSirGlobal mac,
tpSirBssDescription pBssDescr)
{
uint8_t valid = true;
@ -482,13 +482,13 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pJoinReq Pointer to received SME_JOIN_REQ message
* @return true when received SME_JOIN_REQ is formatted correctly
* false otherwise
*/
uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq)
uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal mac, tpSirSmeJoinReq pJoinReq)
{
uint8_t valid = true;
@ -498,25 +498,25 @@ uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq)
* validity is not required.
*/
if (!pJoinReq->force_rsne_override &&
!lim_is_rsn_ie_valid_in_sme_req_message(pMac, &pJoinReq->rsnIE)) {
!lim_is_rsn_ie_valid_in_sme_req_message(mac, &pJoinReq->rsnIE)) {
pe_err("received SME_JOIN_REQ with invalid RSNIE");
valid = false;
goto end;
}
if (!lim_is_addie_valid_in_sme_req_message(pMac, &pJoinReq->addIEScan)) {
if (!lim_is_addie_valid_in_sme_req_message(mac, &pJoinReq->addIEScan)) {
pe_err("received SME_JOIN_REQ with invalid additional IE for scan");
valid = false;
goto end;
}
if (!lim_is_addie_valid_in_sme_req_message(pMac, &pJoinReq->addIEAssoc)) {
if (!lim_is_addie_valid_in_sme_req_message(mac, &pJoinReq->addIEAssoc)) {
pe_err("received SME_JOIN_REQ with invalid additional IE for assoc");
valid = false;
goto end;
}
if (!lim_is_bss_descr_valid_in_sme_req_message(pMac, &pJoinReq->bssDescription)) {
if (!lim_is_bss_descr_valid_in_sme_req_message(mac, &pJoinReq->bssDescription)) {
/* / Received eWNI_SME_JOIN_REQ with invalid BSS Info */
/* Log the event */
pe_err("received SME_JOIN_REQ with invalid bssInfo");
@ -557,7 +557,7 @@ end:
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pDisassocReq Pointer to received SME_DISASSOC_REQ message
* @return true When received SME_DISASSOC_REQ is formatted
* correctly
@ -565,7 +565,7 @@ end:
*/
uint8_t
lim_is_sme_disassoc_req_valid(tpAniSirGlobal pMac,
lim_is_sme_disassoc_req_valid(tpAniSirGlobal mac,
tpSirSmeDisassocReq pDisassocReq,
tpPESession psessionEntry)
{
@ -590,7 +590,7 @@ lim_is_sme_disassoc_req_valid(tpAniSirGlobal pMac,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pDisassocCnf Pointer to received SME_DISASSOC_REQ message
* @return true When received SME_DISASSOC_CNF is formatted
* correctly
@ -598,7 +598,7 @@ lim_is_sme_disassoc_req_valid(tpAniSirGlobal pMac,
*/
uint8_t
lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal pMac,
lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal mac,
tpSirSmeDisassocCnf pDisassocCnf,
tpPESession psessionEntry)
{
@ -622,14 +622,14 @@ lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal pMac,
*
***NOTE:
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param pDeauthReq Pointer to received SME_DEAUTH_REQ message
* @return true When received SME_DEAUTH_REQ is formatted correctly
* false otherwise
*/
uint8_t
lim_is_sme_deauth_req_valid(tpAniSirGlobal pMac, tpSirSmeDeauthReq pDeauthReq,
lim_is_sme_deauth_req_valid(tpAniSirGlobal mac, tpSirSmeDeauthReq pDeauthReq,
tpPESession psessionEntry)
{
if (qdf_is_macaddr_group(&pDeauthReq->peer_macaddr) &&
@ -659,7 +659,7 @@ lim_is_sme_deauth_req_valid(tpAniSirGlobal pMac, tpSirSmeDeauthReq pDeauthReq,
*/
uint8_t
lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
lim_is_sme_set_context_req_valid(tpAniSirGlobal mac,
tpSirSmeSetContextReq pSetContextReq)
{
uint8_t i = 0;
@ -710,7 +710,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
} else if (pSetContextReq->keyMaterial.edType > eSIR_ED_NONE) {
bool privacy;
privacy = pMac->mlme_cfg->wep_params.is_privacy_enabled;
privacy = mac->mlme_cfg->wep_params.is_privacy_enabled;
if (!privacy) {
/**

View file

@ -44,18 +44,18 @@
***NOTE:
* NA
*
* @param pMac pointer to Global Mac structure.
* @param mac pointer to Global Mac structure.
* @param assocId AssocID of the Station.
* @param bssidx pointer to the bss index, which will be returned by the function.
*
* @return success if GET operation is ok, else Failure.
*/
QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal pMac, uint16_t assocId,
QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal mac, uint16_t assocId,
uint8_t *bssidx, tpPESession psessionEntry)
{
tpDphHashNode pSta =
dph_get_hash_entry(pMac, assocId, &psessionEntry->dph.dphHashTable);
dph_get_hash_entry(mac, assocId, &psessionEntry->dph.dphHashTable);
if (pSta == NULL) {
pe_err("invalid STA: %d", assocId);

View file

@ -35,7 +35,7 @@
#include "ani_global.h"
#include "lim_types.h"
QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal pMac, uint16_t assocId,
QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal mac, uint16_t assocId,
uint8_t *bssidx, tpPESession psessionEntry);
#endif

View file

@ -91,12 +91,12 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason)
}
}
void lim_trace_init(tpAniSirGlobal pMac)
void lim_trace_init(tpAniSirGlobal mac)
{
qdf_trace_register(QDF_MODULE_ID_PE, &lim_trace_dump);
}
void lim_trace_dump(void *pMac, tp_qdf_trace_record pRecord,
void lim_trace_dump(void *mac, tp_qdf_trace_record pRecord,
uint16_t recIndex)
{
static char *frameSubtypeStr[LIM_TRACE_MAX_SUBTYPES] = {
@ -272,7 +272,7 @@ void lim_trace_dump(void *pMac, tp_qdf_trace_record pRecord,
}
}
void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
void mac_trace_msg_tx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
{
uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
@ -281,23 +281,23 @@ void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
switch (module_id) {
case SIR_LIM_MODULE_ID:
if (msgId >= SIR_LIM_ITC_MSG_TYPES_BEGIN)
mac_trace(pMac, TRACE_CODE_TX_LIM_MSG, session, data);
mac_trace(mac, TRACE_CODE_TX_LIM_MSG, session, data);
else
mac_trace(pMac, TRACE_CODE_TX_SME_MSG, session, data);
mac_trace(mac, TRACE_CODE_TX_SME_MSG, session, data);
break;
case SIR_WMA_MODULE_ID:
mac_trace(pMac, TRACE_CODE_TX_WMA_MSG, session, data);
mac_trace(mac, TRACE_CODE_TX_WMA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
mac_trace(pMac, TRACE_CODE_TX_CFG_MSG, session, data);
mac_trace(mac, TRACE_CODE_TX_CFG_MSG, session, data);
break;
default:
mac_trace(pMac, module_id, session, data);
mac_trace(mac, module_id, session, data);
break;
}
}
void mac_trace_msg_tx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
void mac_trace_msg_tx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
uint32_t data)
{
uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
@ -306,20 +306,20 @@ void mac_trace_msg_tx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
switch (module_id) {
case SIR_LIM_MODULE_ID:
if (msgId >= SIR_LIM_ITC_MSG_TYPES_BEGIN)
mac_trace_new(pMac, module, TRACE_CODE_TX_LIM_MSG,
mac_trace_new(mac, module, TRACE_CODE_TX_LIM_MSG,
session, data);
else
mac_trace_new(pMac, module, TRACE_CODE_TX_SME_MSG,
mac_trace_new(mac, module, TRACE_CODE_TX_SME_MSG,
session, data);
break;
case SIR_WMA_MODULE_ID:
mac_trace_new(pMac, module, TRACE_CODE_TX_WMA_MSG, session, data);
mac_trace_new(mac, module, TRACE_CODE_TX_WMA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
mac_trace_new(pMac, module, TRACE_CODE_TX_CFG_MSG, session, data);
mac_trace_new(mac, module, TRACE_CODE_TX_CFG_MSG, session, data);
break;
default:
mac_trace(pMac, module_id, session, data);
mac_trace(mac, module_id, session, data);
break;
}
}
@ -328,7 +328,7 @@ void mac_trace_msg_tx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
* bit31: Rx message deferred or not
* bit 0-15: message ID:
*/
void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
void mac_trace_msg_rx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
{
uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
uint8_t module_id = (uint8_t) MAC_TRACE_GET_MODULE_ID(data);
@ -336,18 +336,18 @@ void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
switch (module_id) {
case SIR_LIM_MODULE_ID:
if (msgId >= SIR_LIM_ITC_MSG_TYPES_BEGIN)
mac_trace(pMac, TRACE_CODE_RX_LIM_MSG, session, data);
mac_trace(mac, TRACE_CODE_RX_LIM_MSG, session, data);
else
mac_trace(pMac, TRACE_CODE_RX_SME_MSG, session, data);
mac_trace(mac, TRACE_CODE_RX_SME_MSG, session, data);
break;
case SIR_WMA_MODULE_ID:
mac_trace(pMac, TRACE_CODE_RX_WMA_MSG, session, data);
mac_trace(mac, TRACE_CODE_RX_WMA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
mac_trace(pMac, TRACE_CODE_RX_CFG_MSG, session, data);
mac_trace(mac, TRACE_CODE_RX_CFG_MSG, session, data);
break;
default:
mac_trace(pMac, module_id, session, data);
mac_trace(mac, module_id, session, data);
break;
}
}
@ -356,7 +356,7 @@ void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
* bit31: Rx message deferred or not
* bit 0-15: message ID:
*/
void mac_trace_msg_rx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
void mac_trace_msg_rx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
uint32_t data)
{
uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
@ -365,20 +365,20 @@ void mac_trace_msg_rx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
switch (module_id) {
case SIR_LIM_MODULE_ID:
if (msgId >= SIR_LIM_ITC_MSG_TYPES_BEGIN)
mac_trace_new(pMac, module, TRACE_CODE_RX_LIM_MSG,
mac_trace_new(mac, module, TRACE_CODE_RX_LIM_MSG,
session, data);
else
mac_trace_new(pMac, module, TRACE_CODE_RX_SME_MSG,
mac_trace_new(mac, module, TRACE_CODE_RX_SME_MSG,
session, data);
break;
case SIR_WMA_MODULE_ID:
mac_trace_new(pMac, module, TRACE_CODE_RX_WMA_MSG, session, data);
mac_trace_new(mac, module, TRACE_CODE_RX_WMA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
mac_trace_new(pMac, module, TRACE_CODE_RX_CFG_MSG, session, data);
mac_trace_new(mac, module, TRACE_CODE_RX_CFG_MSG, session, data);
break;
default:
mac_trace(pMac, module_id, session, data);
mac_trace(mac, module_id, session, data);
break;
}
}

View file

@ -100,11 +100,11 @@
#define LIM_MIN_MEM_ASSOC 4
/* / Verifies whether given mac addr matches the CURRENT Bssid */
#define IS_CURRENT_BSSID(pMac, addr, psessionEntry) (!qdf_mem_cmp(addr, \
#define IS_CURRENT_BSSID(mac, addr, psessionEntry) (!qdf_mem_cmp(addr, \
psessionEntry->bssId, \
sizeof(psessionEntry->bssId)))
/* / Verifies whether given addr matches the REASSOC Bssid */
#define IS_REASSOC_BSSID(pMac, addr, psessionEntry) (!qdf_mem_cmp(addr, \
#define IS_REASSOC_BSSID(mac, addr, psessionEntry) (!qdf_mem_cmp(addr, \
psessionEntry->limReAssocbssId, \
sizeof(psessionEntry->limReAssocbssId)))
@ -430,25 +430,25 @@ void lim_process_sme_del_bss_rsp(tpAniSirGlobal, uint32_t, tpPESession);
*/
void lim_process_mlm_start_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf);
void lim_get_random_bssid(tpAniSirGlobal pMac, uint8_t *data);
void lim_get_random_bssid(tpAniSirGlobal mac, uint8_t *data);
/* Function to handle HT and HT IE CFG parameter intializations */
void handle_ht_capabilityand_ht_info(struct mac_context *pMac,
void handle_ht_capabilityand_ht_info(struct mac_context *mac,
tpPESession psessionEntry);
void lim_handle_param_update(tpAniSirGlobal pMac, eUpdateIEsType cfgId);
void lim_handle_param_update(tpAniSirGlobal mac, eUpdateIEsType cfgId);
/* Function to apply CFG parameters before join/reassoc/start BSS */
void lim_apply_configuration(tpAniSirGlobal, tpPESession);
/**
* lim_set_cfg_protection() - sets lim global cfg cache from the config
* @pMac: global mac context
* @mac: global mac context
* @pesessionEntry: PE session
*
* Return none
*/
void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry);
void lim_set_cfg_protection(tpAniSirGlobal mac, tpPESession pesessionEntry);
/* Function to Initialize MLM state machine on STA */
QDF_STATUS lim_init_mlm(tpAniSirGlobal);
@ -465,11 +465,11 @@ void lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal, uint8_t *,
/* Process Auth frame when we have a session in progress. */
void lim_process_auth_frame(tpAniSirGlobal, uint8_t *, tpPESession);
QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *,
QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal mac, uint8_t *,
void *body);
void lim_process_assoc_req_frame(tpAniSirGlobal, uint8_t *, uint8_t, tpPESession);
void lim_send_mlm_assoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
void lim_send_mlm_assoc_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
tpPESession psessionEntry);
void lim_process_assoc_rsp_frame(tpAniSirGlobal, uint8_t *, uint8_t, tpPESession);
@ -518,7 +518,7 @@ void lim_process_deauth_frame(tpAniSirGlobal, uint8_t *, tpPESession);
void lim_perform_deauth(tpAniSirGlobal mac_ctx, tpPESession pe_session,
uint16_t rc, tSirMacAddr addr, int32_t frame_rssi);
void lim_process_action_frame(tpAniSirGlobal, uint8_t *, tpPESession);
void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxMetaInfo);
void lim_process_action_frame_no_session(tpAniSirGlobal mac, uint8_t *pRxMetaInfo);
void lim_populate_p2p_mac_header(tpAniSirGlobal, uint8_t *);
void lim_populate_mac_header(tpAniSirGlobal, uint8_t *, uint8_t, uint8_t,
@ -532,7 +532,7 @@ void lim_send_auth_mgmt_frame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAdd
uint8_t, tpPESession);
void lim_send_assoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmAssocReq *, tpPESession);
#ifdef WLAN_FEATURE_HOST_ROAM
void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac,
void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac,
tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry);
void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmReassocReq *,
tpPESession);
@ -549,7 +549,7 @@ void lim_process_rx_scan_handler(struct wlan_objmgr_vdev *vdev,
struct scan_event *event, void *arg);
#else
static inline void lim_send_reassoc_req_with_ft_ies_mgmt_frame(
tpAniSirGlobal pMac, tLimMlmReassocReq *pMlmReassocReq,
tpAniSirGlobal mac, tLimMlmReassocReq *pMlmReassocReq,
tpPESession psessionEntry)
{}
static inline void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
@ -605,14 +605,14 @@ static inline void lim_send_obss_color_collision_cfg(tpAniSirGlobal mac_ctx,
enum wmi_obss_color_collision_evt_type event_type)
{}
#endif
void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer,
void lim_send_delts_req_action_frame(tpAniSirGlobal mac, tSirMacAddr peer,
uint8_t wmmTspecPresent,
tSirMacTSInfo * pTsinfo,
tSirMacTspecIE * pTspecIe,
tpPESession psessionEntry);
void lim_send_addts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
void lim_send_addts_req_action_frame(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
tSirAddtsReqInfo *addts, tpPESession);
void lim_send_addts_rsp_action_frame(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
void lim_send_addts_rsp_action_frame(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
uint16_t statusCode, tSirAddtsReqInfo *addts,
tSirMacScheduleIE *pSchedule, tpPESession);
@ -641,7 +641,7 @@ QDF_STATUS lim_p2p_oper_chan_change_confirm_action_frame(
tpAniSirGlobal mac_ctx, tSirMacAddr peer,
tpPESession session_entry);
QDF_STATUS lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac,
QDF_STATUS lim_send_vht_opmode_notification_frame(tpAniSirGlobal mac,
tSirMacAddr peer, uint8_t nMode,
tpPESession psessionEntry);
@ -653,7 +653,7 @@ QDF_STATUS lim_send_link_report_action_frame(tpAniSirGlobal, tpSirMacLinkReport,
/**
* lim_send_radio_measure_report_action_frame - Send RRM report action frame
* @pMac: pointer to global MAC context
* @mac: pointer to global MAC context
* @dialog_token: Dialog token to be used in the action frame
* @num_report: number of reports in pRRMReport
* @is_last_frame: is the current report last or more reports to follow
@ -664,7 +664,7 @@ QDF_STATUS lim_send_link_report_action_frame(tpAniSirGlobal, tpSirMacLinkReport,
* Return: Ret Status
*/
QDF_STATUS
lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
lim_send_radio_measure_report_action_frame(tpAniSirGlobal mac,
uint8_t dialog_token,
uint8_t num_report,
bool is_last_frame,
@ -674,19 +674,19 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
#ifdef FEATURE_WLAN_TDLS
void lim_init_tdls_data(tpAniSirGlobal, tpPESession);
QDF_STATUS lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal pMac,
QDF_STATUS lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac,
uint32_t *pMsgBuf);
QDF_STATUS lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
QDF_STATUS lim_process_sme_tdls_add_sta_req(tpAniSirGlobal mac,
uint32_t *pMsgBuf);
QDF_STATUS lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac,
QDF_STATUS lim_process_sme_tdls_del_sta_req(tpAniSirGlobal mac,
uint32_t *pMsgBuf);
void lim_send_sme_mgmt_tx_completion(
tpAniSirGlobal pMac,
tpAniSirGlobal mac,
uint32_t sme_session_id,
uint32_t txCompleteStatus);
QDF_STATUS lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
tpPESession session_entry);
QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession);
QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal mac, void *msg, tpPESession);
void lim_process_tdls_del_sta_rsp(tpAniSirGlobal mac_ctx,
struct scheduler_msg *lim_msg,
tpPESession session_entry);
@ -696,7 +696,7 @@ static inline QDF_STATUS lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
{
return QDF_STATUS_SUCCESS;
}
static inline void lim_init_tdls_data(tpAniSirGlobal pMac,
static inline void lim_init_tdls_data(tpAniSirGlobal mac,
tpPESession pSessionEntry)
{
@ -717,7 +717,7 @@ void limHandleMaxRetriesInterrupt(uint32_t);
uint32_t lim_defer_msg(tpAniSirGlobal, struct scheduler_msg *);
/* / Function that Switches the Channel and sets the CB Mode */
void lim_set_channel(tpAniSirGlobal pMac, uint8_t channel,
void lim_set_channel(tpAniSirGlobal mac, uint8_t channel,
uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1,
enum phy_ch_width ch_width, int8_t maxTxPower,
uint8_t peSessionId, uint32_t cac_duration_ms,
@ -739,47 +739,47 @@ void lim_send_tpc_request_frame(tpAniSirGlobal, tSirMacAddr,
tpPESession psessionEntry);
/* Function(s) to handle responses received from HAL */
void lim_process_mlm_add_bss_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_add_bss_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ);
void lim_process_mlm_add_sta_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_add_sta_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQt,
tpPESession psessionEntry);
void lim_process_mlm_del_sta_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ);
void lim_process_mlm_del_bss_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_del_bss_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ,
tpPESession);
void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal pMac,
void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ,
tpPESession psessionEntry);
void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac,
void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ,
tpPESession psessionEntry);
void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal pMac,
void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ,
tpPESession psessionEntry);
void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ);
void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal pMac,
void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac,
struct scheduler_msg *limMsgQ);
/* Function to process WMA_SWITCH_CHANNEL_RSP message */
void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *);
void lim_process_switch_channel_rsp(tpAniSirGlobal mac, void *);
void lim_covert_channel_scan_type(tpAniSirGlobal pMac, uint8_t channelNum,
void lim_covert_channel_scan_type(tpAniSirGlobal mac, uint8_t channelNum,
bool passiveToActive);
void lim_set_dfs_channel_list(tpAniSirGlobal pMac, uint8_t channelNum,
void lim_set_dfs_channel_list(tpAniSirGlobal mac, uint8_t channelNum,
tSirDFSChannelList *dfsChannelList);
void limContinueChannelLearn(tpAniSirGlobal);
QDF_STATUS lim_sta_send_down_link(join_params *param);
#ifdef WLAN_FEATURE_11W
/* 11w send SA query request action frame */
QDF_STATUS lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *transId,
QDF_STATUS lim_send_sa_query_request_frame(tpAniSirGlobal mac, uint8_t *transId,
tSirMacAddr peer,
tpPESession psessionEntry);
/* 11w SA query request action frame handler */
QDF_STATUS lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
QDF_STATUS lim_send_sa_query_response_frame(tpAniSirGlobal mac,
uint8_t *transId, tSirMacAddr peer,
tpPESession psessionEntry);
#endif
@ -803,14 +803,14 @@ QDF_STATUS lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
***NOTE:
* NA
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param msgType Indicates the MLM primitive message type
* @param *pMsgBuf A pointer to the MLM message buffer
*
* @return None
*/
static inline void
lim_post_sme_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
lim_post_sme_message(tpAniSirGlobal mac, uint32_t msgType, uint32_t *pMsgBuf)
{
struct scheduler_msg msg = {0};
@ -823,11 +823,11 @@ lim_post_sme_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
msg.bodyptr = pMsgBuf;
msg.bodyval = 0;
if (msgType > eWNI_SME_MSG_TYPES_BEGIN) {
MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION,
MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, NO_SESSION,
msg.type));
lim_process_sme_req_messages(pMac, &msg);
lim_process_sme_req_messages(mac, &msg);
} else {
lim_process_mlm_rsp_messages(pMac, msgType, pMsgBuf);
lim_process_mlm_rsp_messages(mac, msgType, pMsgBuf);
}
} /*** end lim_post_sme_message() ***/
@ -850,14 +850,14 @@ lim_post_sme_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
***NOTE:
* NA
*
* @param pMac Pointer to Global MAC structure
* @param mac Pointer to Global MAC structure
* @param msgType Indicates the MLM primitive message type
* @param *pMsgBuf A pointer to the MLM message buffer
*
* @return None
*/
static inline void
lim_post_mlm_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
lim_post_mlm_message(tpAniSirGlobal mac, uint32_t msgType, uint32_t *pMsgBuf)
{
struct scheduler_msg msg = {0};
@ -868,8 +868,8 @@ lim_post_mlm_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
msg.type = (uint16_t) msgType;
msg.bodyptr = pMsgBuf;
msg.bodyval = 0;
MTRACE(mac_trace_msg_rx(pMac, NO_SESSION, msg.type));
lim_process_mlm_req_messages(pMac, &msg);
MTRACE(mac_trace_msg_rx(mac, NO_SESSION, msg.type));
lim_process_mlm_req_messages(mac, &msg);
} /*** end lim_post_mlm_message() ***/
/**
@ -933,27 +933,27 @@ QDF_STATUS lim_send_beacon_ind(tpAniSirGlobal mac_ctx, tpPESession session,
enum sir_bcn_update_reason reason);
void
lim_send_vdev_restart(tpAniSirGlobal pMac, tpPESession psessionEntry,
lim_send_vdev_restart(tpAniSirGlobal mac, tpPESession psessionEntry,
uint8_t sessionId);
void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct qdf_mac_addr addr,
void lim_get_wpspbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr addr,
uint8_t *uuid_e, eWPSPBCOverlap *overlap,
tpPESession psessionEntry);
void limWPSPBCTimeout(tpAniSirGlobal pMac, tpPESession psessionEntry);
void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry);
void lim_remove_pbc_sessions(tpAniSirGlobal pMac,
void limWPSPBCTimeout(tpAniSirGlobal mac, tpPESession psessionEntry);
void lim_wpspbc_close(tpAniSirGlobal mac, tpPESession psessionEntry);
void lim_remove_pbc_sessions(tpAniSirGlobal mac,
struct qdf_mac_addr pRemoveMac,
tpPESession psessionEntry);
#define LIM_WPS_OVERLAP_TIMER_MS 10000
void lim_process_remain_on_chn_timeout(tpAniSirGlobal pMac);
void lim_send_p2p_action_frame(tpAniSirGlobal pMac, struct scheduler_msg *pMsg);
void lim_process_remain_on_chn_timeout(tpAniSirGlobal mac);
void lim_send_p2p_action_frame(tpAniSirGlobal mac, struct scheduler_msg *pMsg);
void lim_process_disassoc_ack_timeout(tpAniSirGlobal pMac);
void lim_process_deauth_ack_timeout(tpAniSirGlobal pMac);
QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal pMac);
QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac);
void lim_process_disassoc_ack_timeout(tpAniSirGlobal mac);
void lim_process_deauth_ack_timeout(tpAniSirGlobal mac);
QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac);
QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal mac);
/**
* lim_disassoc_tx_complete_cnf() - callback to indicate Tx completion
@ -987,8 +987,8 @@ typedef struct sSetLinkCbackParams {
void *cbackDataPtr;
} tSetLinkCbackParams;
int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg);
void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data);
int lim_process_remain_on_chnl_req(tpAniSirGlobal mac, uint32_t *pMsg);
void lim_remain_on_chn_rsp(tpAniSirGlobal mac, QDF_STATUS status, uint32_t *data);
void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal mac_ctx,
QDF_STATUS status, uint32_t *ctx);