lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename pLimJoinReq

Browse Source 
Linux coding style doesn't allow camel case notations. So
rename pLimJoinReq to be in compliance.

Change-Id: I813179ef538bdc4b4207123b5f7b7f6601091cf9
CRs-Fixed: 2480399
This commit is contained in:
Pragaspathi Thilagaraj 2019-06-22 13:00:34 +05:30 committed by nshrivas
parent 2526aab3a3
commit 64ae59da1a
13 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/mac/src/pe/include/lim_session.h
View File

@ -160,7 +160,7 @@ struct pe_session {
uint8_t operMode; /* AP - 0; STA - 1 ; */
tSirNwType nwType;
struct start_bss_req *pLimStartBssReq; /* handle to start bss req */
struct join_req *pLimJoinReq; /* handle to sme join req */
struct join_req *lim_join_req; /* handle to sme join req */
struct join_req *pLimReAssocReq; /* handle to sme reassoc req */
tpLimMlmJoinReq pLimMlmJoinReq; /* handle to MLM join Req */
void *pLimMlmReassocRetryReq; /* keep reasoc req for retry */

10
core/mac/src/pe/lim/lim_assoc_utils.c
View File

@ -809,8 +809,8 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
pe_session = NULL;
}
} else {
qdf_mem_free(pe_session->pLimJoinReq);
pe_session->pLimJoinReq = NULL;
qdf_mem_free(pe_session->lim_join_req);
pe_session->lim_join_req = NULL;
pe_debug("Lim Posting eWNI_SME_JOIN_RSP to SME."
"resultCode: %d,status_code: %d,"
@ -2709,7 +2709,7 @@ static void lim_set_mbssid_info(struct pe_session *pe_session)
{
struct scan_mbssid_info *mbssid_info;
mbssid_info = &pe_session->pLimJoinReq->bssDescription.mbssid_info;
mbssid_info = &pe_session->lim_join_req->bssDescription.mbssid_info;
mlme_set_mbssid_info(pe_session->vdev, mbssid_info);
}
@ -2787,7 +2787,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
pAddStaParams->staIdx = staIdx;
pAddStaParams->updateSta = updateSta;
qdf_mem_copy(&pAddStaParams->mbssid_info,
&pe_session->pLimJoinReq->bssDescription.mbssid_info,
&pe_session->lim_join_req->bssDescription.mbssid_info,
sizeof(struct scan_mbssid_info));
lim_set_mbssid_info(pe_session);
@ -4100,7 +4100,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
tDot11fIEVHTCaps *vht_caps = NULL;
uint32_t listen_interval = MLME_CFG_LISTEN_INTERVAL;
struct bss_description *bssDescription =
&pe_session->pLimJoinReq->bssDescription;
&pe_session->lim_join_req->bssDescription;
struct mlme_vht_capabilities_info *vht_cap_info;
vht_cap_info = &mac->mlme_cfg->vht_caps.vht_cap_info;

2
core/mac/src/pe/lim/lim_ft.c
View File

@ -573,7 +573,7 @@ void lim_fill_ft_session(struct mac_context *mac,
ft_session->connected_akm = pe_session->connected_akm;
/* Fields to be filled later */
ft_session->pLimJoinReq = NULL;
ft_session->lim_join_req = NULL;
ft_session->smeSessionId = pe_session->smeSessionId;
lim_extract_ap_capabilities(mac, (uint8_t *) pbssDescription->ieFields,

4
core/mac/src/pe/lim/lim_link_monitoring_algo.c
View File

@ -517,8 +517,8 @@ void lim_handle_heart_beat_failure(struct mac_context *mac_ctx,
*/
pe_debug("HB missed from AP. Sending Probe Req");
/* for searching AP, we don't include any more IE */
if (session->pLimJoinReq) {
scan_ie = &session->pLimJoinReq->addIEScan;
if (session->lim_join_req) {
scan_ie = &session->lim_join_req->addIEScan;
lim_send_probe_req_mgmt_frame(mac_ctx,
&session->ssId,
session->bssId, curr_chan,

9
core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
View File

@ -1016,11 +1016,10 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
* was received earlier
*/
ie_len = lim_get_ielen_from_bss_description(
&session_entry->pLimJoinReq->bssDescription);
&session_entry->lim_join_req->bssDescription);
lim_extract_ap_capabilities(mac_ctx,
(uint8_t *) session_entry->pLimJoinReq->bssDescription.ieFields,
ie_len,
beacon);
(uint8_t *)session_entry->lim_join_req->bssDescription.ieFields,
ie_len, beacon);
if (lim_is_session_he_capable(session_entry)) {
session_entry->mu_edca_present = assoc_rsp->mu_edca_present;
@ -1069,7 +1068,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
/* Update the BSS Entry, this entry was added during preassoc. */
if (QDF_STATUS_SUCCESS == lim_sta_send_add_bss(mac_ctx, assoc_rsp,
beacon,
&session_entry->pLimJoinReq->bssDescription, true,
&session_entry->lim_join_req->bssDescription, true,
session_entry)) {
qdf_mem_free(assoc_rsp);
qdf_mem_free(beacon);

6
core/mac/src/pe/lim/lim_process_fils.c
View File

@ -1110,10 +1110,10 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session,
* MDIE to be sent in auth frame during initial
* mobility domain association
*/
if (session->pLimJoinReq->is11Rconnection) {
if (session->lim_join_req->is11Rconnection) {
struct bss_description *bss_desc;
bss_desc = &session->pLimJoinReq->bssDescription;
bss_desc = &session->lim_join_req->bssDescription;
if (bss_desc->mdiePresent) {
/* Populate MDIE received from AP */
@ -1210,7 +1210,7 @@ static QDF_STATUS lim_generate_fils_pmkr0(struct pe_session *pe_session)
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct pe_fils_session *fils_info = pe_session->fils_info;
struct bss_description *bss_desc =
&pe_session->pLimJoinReq->bssDescription;
&pe_session->lim_join_req->bssDescription;
if (!fils_info)
return QDF_STATUS_E_FAILURE;

4
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View File

@ -2127,8 +2127,8 @@ static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ct
session->pLimMlmJoinReq->bssDescription.bssId,
session->currentOperChannel /*chanNum */,
session->self_mac_addr, session->dot11mode,
&session->pLimJoinReq->addIEScan.length,
session->pLimJoinReq->addIEScan.addIEdata);
&session->lim_join_req->addIEScan.length,
session->lim_join_req->addIEScan.addIEdata);
lim_deactivate_and_change_timer(mac_ctx,
eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
/* Activate Join Periodic Probe Req timer */

34
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View File

@ -332,7 +332,7 @@ static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx,
pe_debug("SessionId: %d Authenticated with BSS",
session_entry->peSessionId);
if (!session_entry->pLimJoinReq) {
if (!session_entry->lim_join_req) {
pe_err("Join Request is NULL");
/* No need to Assert. JOIN timeout will handle this error */
return;
@ -352,7 +352,7 @@ static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx,
pe_err("could not retrieve Capabilities value");
/* Clear spectrum management bit if AP doesn't support it */
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
if (!(session_entry->lim_join_req->bssDescription.capabilityInfo &
LIM_SPECTRUM_MANAGEMENT_BIT_MASK))
/*
* AP doesn't support spectrum management
@ -361,19 +361,19 @@ static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx,
caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
/* Clear rrm bit if AP doesn't support it */
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
if (!(session_entry->lim_join_req->bssDescription.capabilityInfo &
LIM_RRM_BIT_MASK))
caps &= (~LIM_RRM_BIT_MASK);
/* Clear short preamble bit if AP does not support it */
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
if (!(session_entry->lim_join_req->bssDescription.capabilityInfo &
(LIM_SHORT_PREAMBLE_BIT_MASK))) {
caps &= (~LIM_SHORT_PREAMBLE_BIT_MASK);
pe_debug("Clearing short preamble:no AP support");
}
/* Clear immediate block ack bit if AP does not support it */
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
if (!(session_entry->lim_join_req->bssDescription.capabilityInfo &
(LIM_IMMEDIATE_BLOCK_ACK_MASK))) {
caps &= (~LIM_IMMEDIATE_BLOCK_ACK_MASK);
pe_debug("Clearing Immed Blk Ack:no AP support");
@ -1262,8 +1262,8 @@ QDF_STATUS lim_sta_send_down_link(join_params *param)
* to SME
*/
lim_cleanup_rx_path(mac_ctx, sta_ds, session);
qdf_mem_free(session->pLimJoinReq);
session->pLimJoinReq = NULL;
qdf_mem_free(session->lim_join_req);
session->lim_join_req = NULL;
/* Cleanup if add bss failed */
if (session->add_bss_failed) {
dph_delete_hash_entry(mac_ctx,
@ -1273,8 +1273,8 @@ QDF_STATUS lim_sta_send_down_link(join_params *param)
}
return QDF_STATUS_SUCCESS;
}
qdf_mem_free(session->pLimJoinReq);
session->pLimJoinReq = NULL;
qdf_mem_free(session->lim_join_req);
session->lim_join_req = NULL;
error:
/*
@ -2984,13 +2984,13 @@ static void lim_process_switch_channel_join_req(
goto error;
}
if ((!session_entry) || (!session_entry->pLimMlmJoinReq)
|| (!session_entry->pLimJoinReq)) {
if ((!session_entry) || (!session_entry->pLimMlmJoinReq) ||
(!session_entry->lim_join_req)) {
pe_err("invalid pointer!!");
goto error;
}
bss = &session_entry->pLimJoinReq->bssDescription;
bss = &session_entry->lim_join_req->bssDescription;
nontx_bss_id = bss->mbssid_info.profile_num;
session_entry->limPrevMlmState = session_entry->limMlmState;
@ -3088,8 +3088,8 @@ static void lim_process_switch_channel_join_req(
session_entry->pLimMlmJoinReq->bssDescription.bssId,
session_entry->currentOperChannel, session_entry->self_mac_addr,
session_entry->dot11mode,
&session_entry->pLimJoinReq->addIEScan.length,
session_entry->pLimJoinReq->addIEScan.addIEdata);
&session_entry->lim_join_req->addIEScan.length,
session_entry->lim_join_req->addIEScan.addIEdata);
if (session_entry->opmode == QDF_P2P_CLIENT_MODE) {
/* Activate Join Periodic Probe Req timer */
@ -3108,9 +3108,9 @@ error:
qdf_mem_free(session_entry->pLimMlmJoinReq);
session_entry->pLimMlmJoinReq = NULL;
}
if (session_entry->pLimJoinReq) {
qdf_mem_free(session_entry->pLimJoinReq);
session_entry->pLimJoinReq = NULL;
if (session_entry->lim_join_req) {
qdf_mem_free(session_entry->lim_join_req);
session_entry->lim_join_req = NULL;
}
join_cnf.sessionId = session_entry->peSessionId;
} else {

30
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View File

@ -1351,7 +1351,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
*/
/* store the smejoin req handle in session table */
session->pLimJoinReq = sme_join_req;
session->lim_join_req = sme_join_req;
/* Store beaconInterval */
session->beaconParams.beaconInterval =
@ -1529,15 +1529,17 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
}
if (sme_join_req->addIEScan.length)
qdf_mem_copy(&session->pLimJoinReq->addIEScan,
&sme_join_req->addIEScan, sizeof(tSirAddie));
qdf_mem_copy(&session->lim_join_req->addIEScan,
&sme_join_req->addIEScan,
sizeof(tSirAddie));
if (sme_join_req->addIEAssoc.length)
qdf_mem_copy(&session->pLimJoinReq->addIEAssoc,
&sme_join_req->addIEAssoc, sizeof(tSirAddie));
qdf_mem_copy(&session->lim_join_req->addIEAssoc,
&sme_join_req->addIEAssoc,
sizeof(tSirAddie));
val = sizeof(tLimMlmJoinReq) +
session->pLimJoinReq->bssDescription.length + 2;
session->lim_join_req->bssDescription.length + 2;
mlm_join_req = qdf_mem_malloc(val);
if (!mlm_join_req) {
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
@ -1575,15 +1577,15 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
session->supported_nss_1x1);
mlm_join_req->bssDescription.length =
session->pLimJoinReq->bssDescription.length;
session->lim_join_req->bssDescription.length;
qdf_mem_copy((uint8_t *) &mlm_join_req->bssDescription.bssId,
(uint8_t *)
&session->pLimJoinReq->bssDescription.bssId,
session->pLimJoinReq->bssDescription.length + 2);
&session->lim_join_req->bssDescription.bssId,
session->lim_join_req->bssDescription.length + 2);
session->limCurrentBssCaps =
session->pLimJoinReq->bssDescription.capabilityInfo;
session->lim_join_req->bssDescription.capabilityInfo;
reg_max = lim_get_regulatory_max_transmit_power(mac_ctx,
session->currentOperChannel);
@ -1591,9 +1593,9 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
lim_extract_ap_capability(mac_ctx,
(uint8_t *)
session->pLimJoinReq->bssDescription.ieFields,
session->lim_join_req->bssDescription.ieFields,
lim_get_ielen_from_bss_description(
&session->pLimJoinReq->bssDescription),
&session->lim_join_req->bssDescription),
&session->limCurrentBssQosCaps,
&session->gLimCurrentBssUapsd,
&local_power_constraint, session);
@ -1621,7 +1623,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
if (session->gLimCurrentBssUapsd) {
session->gUapsdPerAcBitmask =
session->pLimJoinReq->uapsdPerAcBitmask;
session->lim_join_req->uapsdPerAcBitmask;
pe_debug("UAPSD flag for all AC - 0x%2x",
session->gUapsdPerAcBitmask);
@ -1691,7 +1693,7 @@ end:
qdf_mem_free(sme_join_req);
sme_join_req = NULL;
if (session)
session->pLimJoinReq = NULL;
session->lim_join_req = NULL;
}
if (ret_code != eSIR_SME_SUCCESS) {
if (session) {

34
core/mac/src/pe/lim/lim_send_management_frames.c
View File

@ -1693,13 +1693,13 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
sme_sessionid = pe_session->smeSessionId;
/* check this early to avoid unncessary operation */
if (!pe_session->pLimJoinReq) {
pe_err("pe_session->pLimJoinReq is NULL");
if (!pe_session->lim_join_req) {
pe_err("pe_session->lim_join_req is NULL");
qdf_mem_free(mlm_assoc_req);
return;
}
add_ie_len = pe_session->pLimJoinReq->addIEAssoc.length;
add_ie = pe_session->pLimJoinReq->addIEAssoc.addIEdata;
add_ie_len = pe_session->lim_join_req->addIEAssoc.length;
add_ie = pe_session->lim_join_req->addIEAssoc.addIEdata;
frm = qdf_mem_malloc(sizeof(tDot11fAssocRequest));
if (!frm) {
@ -1765,7 +1765,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
LIM_BSS_CAPS_GET(WSM, pe_session->limCurrentBssQosCaps);
if (pe_session->lim11hEnable &&
pe_session->pLimJoinReq->spectrumMgtIndicator == true) {
pe_session->lim_join_req->spectrumMgtIndicator == true) {
power_caps = true;
populate_dot11f_power_caps(mac_ctx, &frm->PowerCaps,
@ -1818,14 +1818,14 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
if (!wps_ie) {
populate_dot11f_rsn_opaque(mac_ctx,
&(pe_session->pLimJoinReq->rsnIE),
&frm->RSNOpaque);
&pe_session->lim_join_req->rsnIE,
&frm->RSNOpaque);
populate_dot11f_wpa_opaque(mac_ctx,
&(pe_session->pLimJoinReq->rsnIE),
&frm->WPAOpaque);
&pe_session->lim_join_req->rsnIE,
&frm->WPAOpaque);
#if defined(FEATURE_WLAN_WAPI)
populate_dot11f_wapi_opaque(mac_ctx,
&(pe_session->pLimJoinReq->rsnIE),
&(pe_session->lim_join_req->rsnIE),
&frm->WAPIOpaque);
#endif /* defined(FEATURE_WLAN_WAPI) */
}
@ -1910,16 +1910,16 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
populate_dot11f_he_caps(mac_ctx, NULL, &frm->he_cap);
}
if (pe_session->pLimJoinReq->is11Rconnection) {
if (pe_session->lim_join_req->is11Rconnection) {
struct bss_description *bssdescr;
bssdescr = &pe_session->pLimJoinReq->bssDescription;
bssdescr = &pe_session->lim_join_req->bssDescription;
pe_debug("mdie = %02x %02x %02x",
(unsigned int) bssdescr->mdie[0],
(unsigned int) bssdescr->mdie[1],
(unsigned int) bssdescr->mdie[2]);
populate_mdie(mac_ctx, &frm->MobilityDomain,
pe_session->pLimJoinReq->bssDescription.mdie);
pe_session->lim_join_req->bssDescription.mdie);
/*
* IEEE80211-ai [13.2.4 FT initial mobility domain association
@ -1945,7 +1945,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
populate_dot11f_ese_version(&frm->ESEVersion);
/* For ESE Associations fill the ESE IEs */
if (pe_session->isESEconnection &&
pe_session->pLimJoinReq->isESEFeatureIniEnabled) {
pe_session->lim_join_req->isESEFeatureIniEnabled) {
#ifndef FEATURE_DISABLE_RM
populate_dot11f_ese_rad_mgmt_cap(&frm->ESERadMgmtCap);
#endif
@ -2398,10 +2398,10 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
}
/* include MDIE in FILS authentication frame */
if (session->pLimJoinReq &&
session->pLimJoinReq->is11Rconnection &&
if (session->lim_join_req &&
session->lim_join_req->is11Rconnection &&
auth_frame->authAlgoNumber == SIR_FILS_SK_WITHOUT_PFS &&
session->pLimJoinReq->bssDescription.mdiePresent)
session->lim_join_req->bssDescription.mdiePresent)
frame_len += (2 + SIR_MDIE_SIZE);
break;

12
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View File

@ -286,18 +286,18 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
ht_profile->apChanWidth = session_entry->ch_width;
}
#endif
pe_debug("pLimJoinReq:%pK, pLimReAssocReq:%pK",
session_entry->pLimJoinReq,
session_entry->pLimReAssocReq);
pe_debug("lim_join_req:%pK, pLimReAssocReq:%pK",
session_entry->lim_join_req,
session_entry->pLimReAssocReq);
if (session_entry->pLimJoinReq)
join_reassoc_req = session_entry->pLimJoinReq;
if (session_entry->lim_join_req)
join_reassoc_req = session_entry->lim_join_req;
if (session_entry->pLimReAssocReq)
join_reassoc_req = session_entry->pLimReAssocReq;
if (!join_reassoc_req) {
pe_err("both pLimJoinReq and pLimReAssocReq NULL");
pe_err("both lim_join_req and pLimReAssocReq NULL");
return;
}

6
core/mac/src/pe/lim/lim_session.c
View File

@ -887,9 +887,9 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
session->pLimStartBssReq = NULL;
}
if (session->pLimJoinReq) {
qdf_mem_free(session->pLimJoinReq);
session->pLimJoinReq = NULL;
if (session->lim_join_req) {
qdf_mem_free(session->lim_join_req);
session->lim_join_req = NULL;
}
if (session->pLimReAssocReq) {

8
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View File

@ -1309,9 +1309,9 @@ populate_dot11f_power_caps(struct mac_context *mac,
pe_session->pLimReAssocReq->powerCap.maxTxPower;
} else {
pCaps->minTxPower =
pe_session->pLimJoinReq->powerCap.minTxPower;
pe_session->lim_join_req->powerCap.minTxPower;
pCaps->maxTxPower =
pe_session->pLimJoinReq->powerCap.maxTxPower;
pe_session->lim_join_req->powerCap.maxTxPower;
}
@ -1501,10 +1501,10 @@ populate_dot11f_supp_channels(struct mac_context *mac,
pDot11f->num_bands =
pe_session->pLimReAssocReq->supportedChannels.numChnl;
} else {
p = (uint8_t *) pe_session->pLimJoinReq->supportedChannels.
p = (uint8_t *)pe_session->lim_join_req->supportedChannels.
channelList;
pDot11f->num_bands =
pe_session->pLimJoinReq->supportedChannels.numChnl;
pe_session->lim_join_req->supportedChannels.numChnl;
}
for (i = 0U; i < pDot11f->num_bands; ++i, ++p) {
pDot11f->bands[i][0] = *p;