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-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Use pre_auth_channel_freq to replace preAuthchannelNum

Browse source 
Add pre_auth_channel_freq into struct sSirFTPreAuthReq and replace
preAuthchannelNum.

Change-Id: I47f8a1e4057b4efd2a307b26c066a695e5338aa2
CRs-Fixed: 2568598
This commit is contained in:
Wu Gao 2019-11-18 20:13:19 +08:00 • committed by nshrivas
commit ceac285c37
5 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ typedef struct sSirFTPreAuthReq {
* We expect only one response per request.
*/
bool bPreAuthRspProcessed;
uint8_t preAuthchannelNum;
uint16_t pre_auth_channel_freq;
/* BSSID currently associated to suspend the link */
tSirMacAddr currbssId;
tSirMacAddr preAuthbssId; /* BSSID to preauth to */

25
core/mac/src/pe/lim/lim_ft_preauth.c
View file

@ -190,8 +190,8 @@ int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx,
* Dont need to suspend if APs are in same channel and DUT
* is not in MCC state
*/
if ((wlan_reg_freq_to_chan(mac_ctx->pdev, session->curr_op_freq) !=
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)
if ((session->curr_op_freq !=
session->ftPEContext.pFTPreAuthReq->pre_auth_channel_freq)
|| lim_is_in_mcc(mac_ctx)) {
/* Need to suspend link only if the channels are different */
pe_debug("Performing pre-auth on diff channel(session %pK)",
@ -468,11 +468,11 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
ft_session->ht_config = pe_session->ht_config;
ft_session->limSmeState = eLIM_SME_WT_REASSOC_STATE;
if (IS_5G_CH(pe_session->ftPEContext.pFTPreAuthReq->
preAuthchannelNum))
ft_session->vdev_nss = mac->vdev_type_nss_5g.sta;
else
if (wlan_reg_is_24ghz_ch_freq(pe_session->ftPEContext.
pFTPreAuthReq->pre_auth_channel_freq))
ft_session->vdev_nss = mac->vdev_type_nss_2g.sta;
else
ft_session->vdev_nss = mac->vdev_type_nss_5g.sta;
pe_debug("created session (%pK) with id = %d",
ft_session, ft_session->peSessionId);
@ -483,18 +483,17 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
lim_print_mac_addr(mac, pe_session->limReAssocbssId, LOGD);
}
send_rsp:
if ((wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) !=
pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum) ||
if ((pe_session->curr_op_freq !=
pe_session->ftPEContext.pFTPreAuthReq->pre_auth_channel_freq) ||
lim_is_in_mcc(mac)) {
/* Need to move to the original AP channel */
lim_process_abort_scan_ind(mac, pe_session->smeSessionId,
pe_session->ftPEContext.pFTPreAuthReq->scan_id,
mac->lim.req_id | PREAUTH_REQUESTOR_ID);
} else {
pe_debug("Pre auth on same channel as connected AP channel %d\
and no mcc pe sessions exist",
pe_session->ftPEContext.pFTPreAuthReq->
preAuthchannelNum);
pe_debug("Pre auth on same freq as connected AP freq %d and no mcc pe sessions exist",
pe_session->ftPEContext.pFTPreAuthReq->
pre_auth_channel_freq);
lim_ft_process_pre_auth_result(mac, pe_session);
}
}
@ -718,7 +717,7 @@ QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
req->scan_req.chan_list.num_chan = 1;
req->scan_req.chan_list.chan[0].freq =
cds_chan_to_freq(ft_preauth_req->preAuthchannelNum);
ft_preauth_req->pre_auth_channel_freq;
req->scan_req.dwell_time_active = LIM_FT_PREAUTH_SCAN_TIME;
req->scan_req.dwell_time_passive = LIM_FT_PREAUTH_SCAN_TIME;

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

@ -409,9 +409,8 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
(uint8_t *) frame, (bytes + ft_ies_length));
if ((pe_session->ftPEContext.pFTPreAuthReq) &&
(lim_get_rf_band(
pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)) ==
BAND_5G)
(!wlan_reg_is_24ghz_ch_freq(
pe_session->ftPEContext.pFTPreAuthReq->pre_auth_channel_freq)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
pe_session->opmode == QDF_P2P_CLIENT_MODE ||

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

@ -2779,9 +2779,8 @@ alloc_packet:
frame, frame_len);
if ((session->ftPEContext.pFTPreAuthReq) &&
(lim_get_rf_band(
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)) ==
BAND_5G)
(!wlan_reg_is_24ghz_ch_freq(
session->ftPEContext.pFTPreAuthReq->pre_auth_channel_freq)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else if (wlan_reg_is_5ghz_ch_freq(session->curr_op_freq) ||
session->opmode == QDF_P2P_CLIENT_MODE ||
@ -2801,8 +2800,8 @@ alloc_packet:
session, QDF_STATUS_SUCCESS, QDF_STATUS_SUCCESS);
if (session->ftPEContext.pFTPreAuthReq)
ch_freq_tx_frame = cds_chan_to_freq(
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum);
ch_freq_tx_frame = session->ftPEContext.
pFTPreAuthReq->pre_auth_channel_freq;
qdf_status = wma_tx_frameWithTxComplete(mac_ctx, packet,
(uint16_t)frame_len,

3
core/sme/src/csr/csr_roam_preauth.c
View file

@ -556,8 +556,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
/* Save the SME Session ID. We need it while processing preauth resp */
csr_session->ftSmeContext.smeSessionId = session_id;
preauth_req->messageType = eWNI_SME_FT_PRE_AUTH_REQ;
preauth_req->preAuthchannelNum =
wlan_reg_freq_to_chan(mac_ctx->pdev, bss_desc->chan_freq);
preauth_req->pre_auth_channel_freq = bss_desc->chan_freq;
preauth_req->dot11mode = dot11mode;
qdf_mem_copy((void *)&preauth_req->currbssId,