A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename pe_session member pePersona

Browse source 
The Linux Coding Style doesn't allow mixed-case names so rename
pePersona to opmode in struct pe_session to be in compliance.

Change-Id: I3434bdba5300fb89c7e78cd16dacfd151ba7c00b
CRs-Fixed: 2459760
This commit is contained in:
Pragaspathi Thilagaraj 2019-05-23 00:46:25 +05:30 • committed by nshrivas
commit e64714a3b4
17 changed files with 141 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -319,7 +319,7 @@ struct pe_session {
uint32_t lim11hEnable;
int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */
enum QDF_OPMODE pePersona;
enum QDF_OPMODE opmode;
int8_t txMgmtPower;
bool is11Rconnection;
bool is_adaptive_11r_connection;

13
core/mac/src/pe/lim/lim_assoc_utils.c
View file

@ -2885,9 +2885,8 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
listenInterval = mac->mlme_cfg->sap_cfg.listen_interval;
pAddStaParams->listenInterval = (uint16_t) listenInterval;
if (QDF_P2P_CLIENT_MODE == pe_session->pePersona) {
if (QDF_P2P_CLIENT_MODE == pe_session->opmode)
pAddStaParams->p2pCapableSta = 1;
}
pe_debug(" StaIdx: %d updateSta = %d htcapable = %d ",
pAddStaParams->staIdx, pAddStaParams->updateSta,
@ -3162,8 +3161,8 @@ lim_check_and_announce_join_success(struct mac_context *mac_ctx,
lim_deactivate_and_change_timer(mac_ctx,
eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
if (QDF_P2P_CLIENT_MODE == session_entry->pePersona &&
beacon_probe_rsp->P2PProbeRes.NoticeOfAbsence.present) {
if (QDF_P2P_CLIENT_MODE == session_entry->opmode &&
beacon_probe_rsp->P2PProbeRes.NoticeOfAbsence.present) {
noa_duration_from_beacon = (uint32_t *)
(beacon_probe_rsp->P2PProbeRes.NoticeOfAbsence.NoADesc + 1);
@ -3997,9 +3996,9 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->status = QDF_STATUS_SUCCESS;
pAddBssParams->respReqd = true;
/* update persona */
pAddBssParams->halPersona = (uint8_t) pe_session->pePersona;
pAddBssParams->halPersona = (uint8_t)pe_session->opmode;
if (QDF_P2P_CLIENT_MODE == pe_session->pePersona)
if (QDF_P2P_CLIENT_MODE == pe_session->opmode)
pAddBssParams->staContext.p2pCapableSta = 1;
pAddBssParams->bSpectrumMgtEnabled = pe_session->spectrumMgtEnabled;
@ -4497,7 +4496,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
pAddBssParams->staContext.sessionId = pe_session->peSessionId;
pAddBssParams->sessionId = pe_session->peSessionId;
pAddBssParams->halPersona = (uint8_t) pe_session->pePersona; /* update persona */
pAddBssParams->halPersona = (uint8_t)pe_session->opmode;
pAddBssParams->bSpectrumMgtEnabled = pe_session->spectrumMgtEnabled;

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

@ -455,7 +455,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
ft_session->peSessionId,
eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE));
}
pAddBssParams->halPersona = (uint8_t) ft_session->pePersona;
pAddBssParams->halPersona = (uint8_t)ft_session->opmode;
ft_session->ftPEContext.pAddBssReq = pAddBssParams;

2
core/mac/src/pe/lim/lim_process_action_frame.c
View file

@ -379,7 +379,7 @@ lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
return;
}
if (session_entry->pePersona == QDF_P2P_GO_MODE) {
if (session_entry->opmode == QDF_P2P_GO_MODE) {
struct sir_sme_ext_cng_chan_ind *ext_cng_chan_ind;
struct scheduler_msg mmh_msg = {0};

2
core/mac/src/pe/lim/lim_process_assoc_req_frame.c
View file

@ -150,7 +150,7 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx,
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
session = &mac_ctx->lim.gpSession[i];
if (session->valid &&
(session->pePersona == QDF_SAP_MODE)) {
(session->opmode == QDF_SAP_MODE)) {
sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa,
&assoc_id, &session->dph.dphHashTable);
if (sta_ds

2
core/mac/src/pe/lim/lim_process_auth_frame.c
View file

@ -1281,7 +1281,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
pe_debug("auth_alg %d ", auth_alg);
/* Restore default failure timeout */
if (QDF_P2P_CLIENT_MODE == pe_session->pePersona &&
if (QDF_P2P_CLIENT_MODE == pe_session->opmode &&
pe_session->defaultAuthFailureTimeout) {
pe_debug("Restore default failure timeout");
if (cfg_in_range(CFG_AUTH_FAILURE_TIMEOUT,

50
core/mac/src/pe/lim/lim_process_message_queue.c
View file

@ -200,16 +200,16 @@ static void lim_process_sae_msg(struct mac_context *mac, struct sir_sae_msg *bod
return;
}
if (session->pePersona != QDF_STA_MODE &&
session->pePersona != QDF_SAP_MODE) {
if (session->opmode != QDF_STA_MODE &&
session->opmode != QDF_SAP_MODE) {
pe_err("SAE:Not supported in this mode %d",
session->pePersona);
session->opmode);
return;
}
pe_debug("SAE:status %d limMlmState %d pePersona %d peer: "
pe_debug("SAE:status %d limMlmState %d opmode %d peer: "
QDF_MAC_ADDR_STR, sae_msg->sae_status,
session->limMlmState, session->pePersona,
session->limMlmState, session->opmode,
QDF_MAC_ADDR_ARRAY(sae_msg->peer_mac_addr));
if (LIM_IS_STA_ROLE(session))
lim_process_sae_msg_sta(mac, session, sae_msg);
@ -1239,7 +1239,7 @@ lim_handle80211_frames(struct mac_context *mac, struct scheduler_msg *limMsg,
pe_session = pe_find_session_by_bssid(mac,
pHdr->bssId, &sessionId);
if (pe_session &&
(QDF_SAP_MODE == pe_session->pePersona)) {
(QDF_SAP_MODE == pe_session->opmode)) {
pe_debug("CAC timer running - drop the frame");
goto end;
}
@ -1747,26 +1747,24 @@ static void lim_process_messages(struct mac_context *mac_ctx,
msg->type);
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
session_entry = &mac_ctx->lim.gpSession[i];
if ((session_entry) && (session_entry->valid)
&& (session_entry->pePersona ==
QDF_P2P_GO_MODE)) { /* Save P2P attr for Go */
qdf_mem_copy(
&session_entry->p2pGoPsUpdate,
msg->bodyptr,
sizeof(tSirP2PNoaAttr));
pe_debug("bssId"
QDF_MAC_ADDR_STR
" ctWin=%d oppPsFlag=%d",
QDF_MAC_ADDR_ARRAY(
session_entry->bssId),
session_entry->p2pGoPsUpdate.ctWin,
session_entry->p2pGoPsUpdate.oppPsFlag);
pe_debug("uNoa1IntervalCnt=%d uNoa1Duration=%d uNoa1Interval=%d uNoa1StartTime=%d",
session_entry->p2pGoPsUpdate.uNoa1IntervalCnt,
session_entry->p2pGoPsUpdate.uNoa1Duration,
session_entry->p2pGoPsUpdate.uNoa1Interval,
session_entry->p2pGoPsUpdate.uNoa1StartTime);
break;
if ((session_entry) && (session_entry->valid) &&
(session_entry->opmode == QDF_P2P_GO_MODE)) {
/* Save P2P attr for Go */
qdf_mem_copy(&session_entry->p2pGoPsUpdate,
msg->bodyptr,
sizeof(tSirP2PNoaAttr));
pe_debug("bssId"
QDF_MAC_ADDR_STR
" ctWin=%d oppPsFlag=%d",
QDF_MAC_ADDR_ARRAY(session_entry->bssId),
session_entry->p2pGoPsUpdate.ctWin,
session_entry->p2pGoPsUpdate.oppPsFlag);
pe_debug("uNoa1IntervalCnt=%d uNoa1Duration=%d uNoa1Interval=%d uNoa1StartTime=%d",
session_entry->p2pGoPsUpdate.uNoa1IntervalCnt,
session_entry->p2pGoPsUpdate.uNoa1Duration,
session_entry->p2pGoPsUpdate.uNoa1Interval,
session_entry->p2pGoPsUpdate.uNoa1StartTime);
break;
}
}
qdf_mem_free(msg->bodyptr);

8
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View file

@ -78,7 +78,7 @@ static void lim_process_sae_auth_timeout(struct mac_context *mac_ctx)
* SAE authentication is not completed. Restore from
* auth state.
*/
if (session->pePersona == QDF_STA_MODE)
if (session->opmode == QDF_STA_MODE)
lim_restore_from_auth_state(mac_ctx,
eSIR_SME_AUTH_TIMEOUT_RESULT_CODE,
eSIR_MAC_UNSPEC_FAILURE_REASON, session);
@ -279,7 +279,7 @@ static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param,
sta_param->lsigTxopProtection, sta_param->fDsssCckMode40Mhz,
sta_param->fShortGI20Mhz, sta_param->fShortGI40Mhz);
if (QDF_P2P_GO_MODE == session_entry->pePersona)
if (QDF_P2P_GO_MODE == session_entry->opmode)
sta_param->p2pCapableSta = 1;
}
@ -404,7 +404,7 @@ lim_mlm_add_bss(struct mac_context *mac_ctx,
session->limMlmState));
/* pass on the session persona to hal */
addbss_param->halPersona = session->pePersona;
addbss_param->halPersona = session->opmode;
if (session->ch_width == CH_WIDTH_160MHZ) {
is_ch_dfs = true;
@ -2239,7 +2239,7 @@ void lim_process_auth_failure_timeout(struct mac_context *mac_ctx)
* Failure timeout. Issue MLM auth confirm with timeout reason
* code. Restore default failure timeout
*/
if (QDF_P2P_CLIENT_MODE == session->pePersona &&
if (QDF_P2P_CLIENT_MODE == session->opmode &&
session->defaultAuthFailureTimeout) {
if (cfg_in_range(CFG_AUTH_FAILURE_TIMEOUT,
session->defaultAuthFailureTimeout)) {

4
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View file

@ -3113,7 +3113,7 @@ static void lim_process_switch_channel_join_req(
&session_entry->pLimJoinReq->addIEScan.length,
session_entry->pLimJoinReq->addIEScan.addIEdata);
if (session_entry->pePersona == QDF_P2P_CLIENT_MODE) {
if (session_entry->opmode == QDF_P2P_CLIENT_MODE) {
/* Activate Join Periodic Probe Req timer */
if (tx_timer_activate
(&mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer)
@ -3220,7 +3220,7 @@ void lim_process_switch_channel_rsp(struct mac_context *mac, void *body)
*/
policy_mgr_update_connection_info(mac->psoc,
pe_session->smeSessionId);
if (pe_session->pePersona == QDF_P2P_CLIENT_MODE) {
if (pe_session->opmode == QDF_P2P_CLIENT_MODE) {
pe_debug("Send p2p operating channel change conf action frame once first beacon is received on new channel");
pe_session->send_p2p_conf_frame = true;
}

4
core/mac/src/pe/lim/lim_process_probe_req_frame.c
View file

@ -287,7 +287,7 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
}
if (session->pePersona == QDF_P2P_GO_MODE) {
if (session->opmode == QDF_P2P_GO_MODE) {
uint8_t i = 0, rate_11b = 0, other_rates = 0;
/* Check 11b rates in supported rates */
for (i = 0; i < probe_req.supportedRates.numRates;
@ -361,7 +361,7 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
session,
probe_req.p2pIePresent);
return;
} else if (session->pePersona ==
} else if (session->opmode ==
QDF_P2P_GO_MODE) {
uint8_t direct_ssid[7] = "DIRECT-";
uint8_t direct_ssid_len = 7;

31
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View file

@ -444,7 +444,7 @@ lim_configure_ap_start_bss_session(struct mac_context *mac_ctx,
session->dtimPeriod = (uint8_t) sme_start_bss_req->dtimPeriod;
/* Enable/disable UAPSD */
session->apUapsdEnable = sme_start_bss_req->apUapsdEnable;
if (session->pePersona == QDF_P2P_GO_MODE) {
if (session->opmode == QDF_P2P_GO_MODE) {
session->proxyProbeRspEn = 0;
} else {
/*
@ -625,9 +625,9 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
sme_start_bss_req->channelId;
/* Store Persona */
session->pePersona = sme_start_bss_req->bssPersona;
session->opmode = sme_start_bss_req->bssPersona;
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("PE PERSONA=%d"), session->pePersona);
FL("PE PERSONA=%d"), session->opmode);
/* Update the phymode */
session->gLimPhyMode = sme_start_bss_req->nwType;
@ -678,7 +678,7 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
case eSIR_INFRA_AP_MODE:
lim_configure_ap_start_bss_session(mac_ctx, session,
sme_start_bss_req);
if (session->pePersona == QDF_SAP_MODE)
if (session->opmode == QDF_SAP_MODE)
session->vdev_nss = vdev_type_nss->sap;
else
session->vdev_nss = vdev_type_nss->p2p_go;
@ -715,7 +715,7 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
}
pe_debug("persona - %d, nss - %d",
session->pePersona, session->vdev_nss);
session->opmode, session->vdev_nss);
session->nss = session->vdev_nss;
if (!mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable2x2)
session->nss = 1;
@ -1399,20 +1399,17 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
*/
session->supported_nss_1x1 = true;
/*Store Persona */
session->pePersona = sme_join_req->staPersona;
pe_debug("enable Smps: %d mode: %d send action: %d supported nss 1x1: %d pePersona %d cbMode %d",
session->enableHtSmps,
session->htSmpsvalue,
session->send_smps_action,
session->supported_nss_1x1,
session->pePersona,
sme_join_req->cbMode);
session->opmode = sme_join_req->staPersona;
pe_debug("enable Smps: %d mode: %d send action: %d supported nss 1x1: %d opmode %d cbMode %d",
session->enableHtSmps, session->htSmpsvalue,
session->send_smps_action, session->supported_nss_1x1,
session->opmode, sme_join_req->cbMode);
/*Store Persona */
session->pePersona = sme_join_req->staPersona;
session->opmode = sme_join_req->staPersona;
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("PE PERSONA=%d cbMode %u nwType: %d dot11mode: %d force_24ghz_in_ht20 %d"),
session->pePersona, sme_join_req->cbMode,
session->opmode, sme_join_req->cbMode,
session->nwType, session->dot11mode,
sme_join_req->force_24ghz_in_ht20);
@ -1422,7 +1419,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
session->vhtCapability =
IS_DOT11_MODE_VHT(session->dot11mode);
if (session->vhtCapability) {
if (session->pePersona == QDF_STA_MODE) {
if (session->opmode == QDF_STA_MODE) {
session->vht_config.su_beam_formee =
sme_join_req->vht_config.su_beam_formee;
} else {
@ -1802,7 +1799,7 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
IS_DOT11_MODE_VHT(reassoc_req->dot11mode);
if (session_entry->vhtCapability) {
if (session_entry->pePersona == QDF_STA_MODE) {
if (session_entry->opmode == QDF_STA_MODE) {
session_entry->vht_config.su_beam_formee =
reassoc_req->vht_config.su_beam_formee;
} else {

18
core/mac/src/pe/lim/lim_send_frames_host_roam.c
View file

@ -411,10 +411,9 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
(BAND_5G == lim_get_rf_band(
pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else if ((BAND_5G ==
lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
|| (pe_session->pePersona == QDF_P2P_GO_MODE))
else if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->assocReq) {
@ -762,14 +761,13 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
pe_session->assocReqLen = nPayload;
}
if ((BAND_5G ==
lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE))
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->pePersona == QDF_P2P_CLIENT_MODE ||
pe_session->pePersona == QDF_STA_MODE)
if (pe_session->opmode == QDF_P2P_CLIENT_MODE ||
pe_session->opmode == QDF_STA_MODE)
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,

156
core/mac/src/pe/lim/lim_send_management_frames.c
View file

@ -238,8 +238,7 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
* sent by P2P Client
*/
if ((MLME_DOT11_MODE_11B != dot11mode) && (p2pie) &&
((pesession) &&
(QDF_P2P_CLIENT_MODE == pesession->pePersona))) {
((pesession) && (QDF_P2P_CLIENT_MODE == pesession->opmode))) {
/*
* In the below API pass channel number > 14, do that it fills
* only 11a rates in supported rates
@ -410,12 +409,10 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
/*
* For unicast probe req mgmt from Join function we don't set
* above variables. So we need to add one more check whether it
* is pePersona is P2P_CLIENT or not
* is opmode is P2P_CLIENT or not
*/
((pesession) &&
(QDF_P2P_CLIENT_MODE == pesession->pePersona))) {
((pesession) && (QDF_P2P_CLIENT_MODE == pesession->opmode)))
txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
qdf_status =
wma_tx_frame(mac_ctx, packet,
@ -523,8 +520,8 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
* In case when cac timer is running for this SAP session then
* avoid sending probe rsp out. It is violation of dfs specification.
*/
if (((pe_session->pePersona == QDF_SAP_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) &&
if (((pe_session->opmode == QDF_SAP_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)) &&
(true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("CAC timer is running, probe response dropped"));
@ -776,10 +773,9 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
}
}
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
)
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
/* Queue Probe Response frame in high priority WQ */
@ -985,13 +981,10 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
pe_debug("Sending an Add TS Request frame to");
lim_print_mac_addr(mac, peerMacAddr, LOGD);
if ((BAND_5G ==
lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
|| (pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -1346,8 +1339,8 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
if ((BAND_5G ==
lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE))
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@ -1492,13 +1485,10 @@ lim_send_delts_req_action_frame(struct mac_context *mac,
pe_debug("Sending DELTS REQ (size %d) to ", nBytes);
lim_print_mac_addr(mac, pMacHdr->da, LOGD);
if ((BAND_5G ==
lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
|| (pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -2134,14 +2124,13 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
pe_session->assocReqLen = payload;
}
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
|| (pe_session->pePersona == QDF_P2P_GO_MODE)
)
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->pePersona == QDF_P2P_CLIENT_MODE ||
pe_session->pePersona == QDF_STA_MODE)
if (pe_session->opmode == QDF_P2P_CLIENT_MODE ||
pe_session->opmode == QDF_STA_MODE)
tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK;
mac_hdr = (tpSirMacMgmtHdr) frame;
@ -2600,14 +2589,13 @@ alloc_packet:
(BAND_5G == lim_get_rf_band(
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else if ((BAND_5G ==
lim_get_rf_band(session->currentOperChannel))
|| (session->pePersona == QDF_P2P_CLIENT_MODE)
|| (session->pePersona == QDF_P2P_GO_MODE))
else if ((BAND_5G == lim_get_rf_band(session->currentOperChannel)) ||
(session->opmode == QDF_P2P_CLIENT_MODE) ||
(session->opmode == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (session->pePersona == QDF_P2P_CLIENT_MODE ||
session->pePersona == QDF_STA_MODE)
if (session->opmode == QDF_P2P_CLIENT_MODE ||
session->opmode == QDF_STA_MODE)
tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@ -2934,12 +2922,11 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
* In case when cac timer is running for this SAP session then
* avoid sending disassoc out. It is violation of dfs specification.
*/
if (((pe_session->pePersona == QDF_SAP_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) &&
if (((pe_session->opmode == QDF_SAP_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)) &&
(true == mac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL
("CAC timer is running, drop disassoc from going out"));
FL("CAC timer is running, drop disassoc from going out"));
if (waitForAck)
lim_send_disassoc_cnf(mac);
return;
@ -3006,12 +2993,10 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
@ -3117,8 +3102,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
* In case when cac timer is running for this SAP session then
* avoid deauth frame out. It is violation of dfs specification.
*/
if (((pe_session->pePersona == QDF_SAP_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) &&
if (((pe_session->opmode == QDF_SAP_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)) &&
(true == mac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL
@ -3188,12 +3173,10 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
#ifdef FEATURE_WLAN_TDLS
@ -3620,12 +3603,10 @@ lim_send_channel_switch_mgmt_frame(struct mac_context *mac,
nStatus);
}
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -3762,12 +3743,10 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
status);
}
if ((BAND_5G ==
lim_get_rf_band(session_entry->currentOperChannel)) ||
(session_entry->pePersona == QDF_P2P_CLIENT_MODE) ||
(session_entry->pePersona == QDF_P2P_GO_MODE)) {
if ((BAND_5G == lim_get_rf_band(session_entry->currentOperChannel)) ||
(session_entry->opmode == QDF_P2P_CLIENT_MODE) ||
(session_entry->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
pe_debug("Send Ext channel Switch to :"QDF_MAC_ADDR_STR" with swcount %d, swmode %d , newchannel %d newops %d",
QDF_MAC_ADDR_ARRAY(mac_hdr->da),
@ -3918,8 +3897,8 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
if ((BAND_5G ==
lim_get_rf_band(session_entry->currentOperChannel)) ||
(session_entry->pePersona == QDF_P2P_CLIENT_MODE) ||
(session_entry->pePersona == QDF_P2P_GO_MODE)) {
(session_entry->opmode == QDF_P2P_CLIENT_MODE) ||
(session_entry->opmode == QDF_P2P_GO_MODE)) {
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
pe_debug("Send frame on channel %d to mac "
@ -4052,12 +4031,10 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
pe_debug("Sending a Neighbor Report Request to");
lim_print_mac_addr(mac, peer, LOGD);
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -4198,11 +4175,10 @@ lim_send_link_report_action_frame(struct mac_context *mac,
pe_warn("Sending a Link Report to");
lim_print_mac_addr(mac, peer, LOGW);
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -4370,12 +4346,10 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
pe_warn("Sending a Radio Measure Report to");
lim_print_mac_addr(mac, peer, LOGW);
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
) {
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE))
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -4507,12 +4481,12 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
#ifdef WLAN_FEATURE_P2P
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
|| (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)
#endif
) {
)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
smeSessionId = pe_session->smeSessionId;
qdf_status = wma_tx_frame(mac,
@ -4638,12 +4612,11 @@ QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
#ifdef WLAN_FEATURE_P2P
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)
|| (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)
#endif
) {
)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, pMacHdr->fc.subType));
@ -4846,12 +4819,11 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
if ((BAND_5G == lim_get_rf_band(session->currentOperChannel))
#ifdef WLAN_FEATURE_P2P
|| (session->pePersona == QDF_P2P_CLIENT_MODE) ||
(session->pePersona == QDF_P2P_GO_MODE)
|| (session->opmode == QDF_P2P_CLIENT_MODE) ||
(session->opmode == QDF_P2P_GO_MODE)
#endif
) {
)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session->peSessionId, mgmt_hdr->fc.subType));

2
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View file

@ -666,7 +666,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
for (i = 0; i < mac->lim.maxBssId; i++) {
session = &mac->lim.gpSession[i];
if (session->valid &&
(session->pePersona == QDF_SAP_MODE)) {
(session->opmode == QDF_SAP_MODE)) {
/* Find the sta ds entry in another session */
sta_ds = dph_lookup_hash_entry(mac,
peerMacAddr, &assoc_id,

8
core/mac/src/pe/lim/lim_utils.c
View file

@ -5014,7 +5014,7 @@ uint8_t lim_get_noa_attr_stream(struct mac_context *mac, uint8_t *pNoaStream,
uint8_t *pBody = pNoaStream;
if ((pe_session) && (pe_session->valid) &&
(pe_session->pePersona == QDF_P2P_GO_MODE)) {
(pe_session->opmode == QDF_P2P_GO_MODE)) {
if ((!(pe_session->p2pGoPsUpdate.uNoa1Duration))
&& (!(pe_session->p2pGoPsUpdate.uNoa2Duration))
&& (!pe_session->p2pGoPsUpdate.oppPsFlag)
@ -5253,9 +5253,9 @@ void lim_get_short_slot_from_phy_mode(struct mac_context *mac, struct pe_session
/* only 2.4G band should have short slot enable, rest it should be default */
if (phyMode == WNI_CFG_PHY_MODE_11G) {
/* short slot is default in all other modes */
if ((pe_session->pePersona == QDF_SAP_MODE) ||
(pe_session->pePersona == QDF_IBSS_MODE) ||
(pe_session->pePersona == QDF_P2P_GO_MODE)) {
if ((pe_session->opmode == QDF_SAP_MODE) ||
(pe_session->opmode == QDF_IBSS_MODE) ||
(pe_session->opmode == QDF_P2P_GO_MODE)) {
val = true;
}
/* Program Polaris based on AP capability */

7
core/mac/src/pe/sch/sch_beacon_process.c
View file

@ -936,10 +936,11 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
lim_send_beacon_params(mac_ctx, &beaconParams, session);
}
if ((session->pePersona == QDF_P2P_CLIENT_MODE) &&
session->send_p2p_conf_frame) {
if ((session->opmode == QDF_P2P_CLIENT_MODE) &&
session->send_p2p_conf_frame) {
lim_p2p_oper_chan_change_confirm_action_frame(mac_ctx,
session->bssId, session);
session->bssId,
session);
session->send_p2p_conf_frame = false;
}
}

6
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View file

@ -665,7 +665,7 @@ populate_dot11f_ht_caps(struct mac_context *mac,
pDot11f->supportedMCSSet[1] = 0;
} else if (IS_24G_CH(pe_session->currentOperChannel) &&
disable_high_ht_mcs_2x2 &&
(pe_session->pePersona == QDF_STA_MODE)) {
(pe_session->opmode == QDF_STA_MODE)) {
pe_debug("Disabling high HT MCS [%d]",
disable_high_ht_mcs_2x2);
pDot11f->supportedMCSSet[1] =
@ -5989,10 +5989,10 @@ QDF_STATUS populate_dot11f_twt_extended_caps(struct mac_context *mac_ctx,
dot11f->num_bytes = DOT11F_IE_EXTCAP_MAX_LEN;
p_ext_cap = (struct s_ext_cap *)dot11f->bytes;
if (pe_session->pePersona == QDF_STA_MODE)
if (pe_session->opmode == QDF_STA_MODE)
p_ext_cap->twt_requestor_support =
mac_ctx->mlme_cfg->twt_cfg.is_twt_requestor_enabled;
if (pe_session->pePersona == QDF_SAP_MODE)
if (pe_session->opmode == QDF_SAP_MODE)
p_ext_cap->twt_responder_support =
mac_ctx->mlme_cfg->twt_cfg.is_twt_responder_enabled;