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

qcacld-3.0: Replace operationChannel for tagCsrRoamConnectedProfile

Browse Source 
Replace operationChannel with op_freq for tagCsrRoamConnectedProfile
in files:
csr_api_roam.c
csr_api_scan.c
csr_neighbor_roam.c

Change-Id: Ibb8df79ed7ed4c837e569a7e320a705bbcf522e4
CRs-Fixed: 2497121
This commit is contained in:
hqu 2019-07-25 22:17:19 +08:00 committed by nshrivas
parent ea4d062c37
commit ed450ee3ec
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/sme/src/csr/csr_api_roam.c
View File

@ -3186,7 +3186,8 @@ static void csr_dump_connection_stats(struct mac_context *mac_ctx,
diag_dot11_mode_from_csr_type(conn_profile->dot11Mode);
conn_stats.bss_type =
diag_persona_from_csr_type(session->pCurRoamProfile->csrPersona);
conn_stats.operating_channel = conn_profile->operationChannel;
conn_stats.operating_channel = wlan_reg_freq_to_chan(mac_ctx->pdev,
conn_profile->op_freq);
conn_stats.qos_capability = conn_profile->qosConnection;
conn_stats.auth_type =
diag_auth_type_from_csr_type(conn_profile->AuthType);
@ -3234,7 +3235,7 @@ void csr_get_sta_cxn_info(struct mac_context *mac_ctx,
if (!session || !session->pCurRoamProfile || !conn_profile)
return;
if (!conn_profile->operationChannel)
if (!conn_profile->op_freq)
return;
qdf_mem_set(buf, buf_sz, '\0');
len += qdf_scnprintf(buf + len, buf_sz - len,
@ -3259,7 +3260,7 @@ void csr_get_sta_cxn_info(struct mac_context *mac_ctx,
len += qdf_scnprintf(buf + len, buf_sz - len,
"\n\tbss_type: %s", csr_get_persona(type));
len += qdf_scnprintf(buf + len, buf_sz - len,
"\n\tchnl: %d", conn_profile->operationChannel);
"\n\tch_freq: %d", conn_profile->op_freq);
len += qdf_scnprintf(buf + len, buf_sz - len,
"\n\tQoS: %d", conn_profile->qosConnection);
authtype = diag_auth_type_from_csr_type(conn_profile->AuthType);
@ -3355,7 +3356,9 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
roam_info->chan_info.info = 0;
}
roam_info->chan_info.chan_id =
roam_info->u.pConnectedProfile->operationChannel;
wlan_reg_freq_to_chan(
mac->pdev,
roam_info->u.pConnectedProfile->op_freq);
roam_info->chan_info.mhz =
cds_chan_to_freq(roam_info->chan_info.chan_id);
roam_info->chan_info.reg_info_1 =
@ -6098,7 +6101,7 @@ void csr_update_scan_entry_associnfo(struct mac_context *mac_ctx,
}
qdf_copy_macaddr(&bss.bssid, &conn_profile->bssid);
bss.chan = conn_profile->operationChannel;
bss.chan = wlan_reg_freq_to_chan(mac_ctx->pdev, conn_profile->op_freq);
bss.ssid.length = conn_profile->SSID.length;
qdf_mem_copy(&bss.ssid.ssid, &conn_profile->SSID.ssId,
bss.ssid.length);
@ -7729,7 +7732,8 @@ QDF_STATUS csr_roam_copy_connected_profile(struct mac_context *mac,
goto end;
}
pDstProfile->ChannelInfo.numOfChannels = 1;
pDstProfile->ChannelInfo.ChannelList[0] = pSrcProfile->operationChannel;
pDstProfile->ChannelInfo.ChannelList[0] =
wlan_reg_freq_to_chan(mac->pdev, pSrcProfile->op_freq);
pDstProfile->AuthType.numEntries = 1;
pDstProfile->AuthType.authType[0] = pSrcProfile->AuthType;
pDstProfile->negotiatedAuthType = pSrcProfile->AuthType;
@ -12233,7 +12237,9 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
*/
if (mac_ctx->obss_scan_offload &&
CSR_IS_CHANNEL_24GHZ(
session->connectedProfile.operationChannel)
wlan_reg_freq_to_chan(
mac_ctx->pdev,
session->connectedProfile.op_freq))
&& (session->connectState ==
eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)
&& session->pCurRoamProfile
@ -17795,6 +17801,7 @@ csr_fetch_valid_ch_lst(struct mac_context *mac_ctx,
bool is_unsafe_chan;
qdf_device_t qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
enum band_info band = BAND_ALL;
uint8_t op_chan;
if (!qdf_ctx) {
cds_err("qdf_ctx is NULL");
@ -17816,11 +17823,14 @@ csr_fetch_valid_ch_lst(struct mac_context *mac_ctx,
}
if (CSR_IS_ROAM_INTRA_BAND_ENABLED(mac_ctx)) {
band = csr_get_rf_band(mac_ctx->roam.roamSession[session_id].
connectedProfile.operationChannel);
sme_debug("updated band %d operational ch %d", band,
mac_ctx->roam.roamSession[session_id].
connectedProfile.operationChannel);
op_chan = wlan_reg_freq_to_chan(
mac_ctx->pdev,
mac_ctx->roam.roamSession[session_id].
connectedProfile.op_freq);
band = csr_get_rf_band(op_chan);
sme_debug("updated band %d operational freq %d", band,
mac_ctx->roam.roamSession[session_id].
connectedProfile.op_freq);
}
ch_lst = mac_ctx->roam.validChannelList;
@ -19321,7 +19331,8 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
roam_params_dst->bssid_favored_factor[i]);
}
op_channel = session->connectedProfile.operationChannel;
op_channel = wlan_reg_freq_to_chan(mac_ctx->pdev,
session->connectedProfile.op_freq);
req_buf->hi_rssi_scan_max_count =
roam_info->cfgParams.hi_rssi_scan_max_count;
req_buf->hi_rssi_scan_delay =

3
core/sme/src/csr/csr_api_scan.c
View File

@ -3041,7 +3041,8 @@ void csr_init_occupied_channels_list(struct mac_context *mac_ctx,
mac_ctx->scan.roam_candidate_count[sessionId] = 0;
csr_add_to_occupied_channels(
mac_ctx, profile->operationChannel,
mac_ctx,
wlan_reg_freq_to_chan(mac_ctx->pdev, profile->op_freq),
sessionId,
&mac_ctx->scan.occupiedChannels[sessionId],
true);

7
core/sme/src/csr/csr_neighbor_roam.c
View File

@ -856,7 +856,9 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac,
qdf_copy_macaddr(&pSession->prevApBssid,
&pSession->connectedProfile.bssid);
pSession->prevOpChannel =
pSession->connectedProfile.operationChannel;
wlan_reg_freq_to_chan(
mac->pdev,
pSession->connectedProfile.op_freq);
pSession->isPrevApInfoValid = true;
pSession->roamTS1 = qdf_mc_timer_get_system_time();
}
@ -963,7 +965,8 @@ static void csr_neighbor_roam_info_ctx_init(
qdf_copy_macaddr(&ngbr_roam_info->currAPbssid,
&session->connectedProfile.bssid);
ngbr_roam_info->currAPoperationChannel =
session->connectedProfile.operationChannel;
wlan_reg_freq_to_chan(mac->pdev,
session->connectedProfile.op_freq);
ngbr_roam_info->currentNeighborLookupThreshold =
ngbr_roam_info->cfgParams.neighborLookupThreshold;
ngbr_roam_info->currentOpportunisticThresholdDiff =