samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Obtain channel params from CDS

Browse Source 
All the regulatory and channel management functionality
moved to CDS.

Cleanup the SME redundant functionality related to channel
parameters generation and update all the code references
to CDF API's

Change-Id: Iaf4e15b4ebb7107d8bbf7a54e42f9ea9358dcdaf
CRs-Fixed: 994562
This commit is contained in:
Sandeep Puligilla
2016-04-27 16:52:49 -07:00
committed by Vishwajith Upendra
parent 0c1301d1fe
commit 1cc23f6e37
13 changed files with 61 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/sap/src/sap_api_link_cntl.c
View File

@@ -189,11 +189,9 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
}
sap_ctx->ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
sme_set_ch_params(hal_handle,
sap_ctx->csr_roamProfile.phyMode,
sap_ctx->channel,
sap_ctx->secondary_ch,
&sap_ctx->ch_params);
cds_set_channel_params(sap_ctx->channel,
sap_ctx->secondary_ch,
&sap_ctx->ch_params);
#ifdef SOFTAP_CHANNEL_RANGE
if (sap_ctx->channelList != NULL) {
/* Always free up the memory for channel selection whatever
@@ -241,9 +239,7 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx,
struct ch_params_s ch_params = {0};
ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
sme_set_ch_params(hal, sap_ctx->csr_roamProfile.phyMode, channel,
sec_ch, &ch_params);
cds_set_channel_params(channel, sec_ch, &ch_params);
sap_ctx->acs_cfg->ch_width = ch_params.ch_width;
if (sap_ctx->acs_cfg->ch_width > CH_WIDTH_40MHZ)
sap_ctx->acs_cfg->vht_seg0_center_ch =
@@ -525,7 +521,6 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
uint8_t intf;
QDF_STATUS qdf_status;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal);
eCsrPhyMode phy_mode = sap_ctx->csr_roamProfile.phyMode;
uint8_t dfs_beacon_start_req = 0;
if (sap_ctx->csr_roamProfile.disableDFSChSwitch) {
@@ -572,9 +567,9 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
* currently. For e.g. 20/40/80 MHz operation
*/
if (mac_ctx->sap.SapDfsInfo.target_channel)
sme_set_ch_params(hHal, phy_mode,
mac_ctx->sap.SapDfsInfo.target_channel, 0,
&sap_ctx->ch_params);
cds_set_channel_params(mac_ctx->sap.SapDfsInfo.target_channel,
0, &sap_ctx->ch_params);
/*
* Fetch the number of SAP interfaces. If the number of sap Interface
* more than one then we will make is_sap_ready_for_chnl_chng to true

12
core/sap/src/sap_fsm.c
View File

@@ -3392,9 +3392,8 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
sap_ctx->channel, ch);
sap_ctx->channel = ch;
sme_set_ch_params(hal, sap_ctx->csr_roamProfile.phyMode,
sap_ctx->channel, sap_ctx->secondary_ch,
&sap_ctx->ch_params);
cds_set_channel_params(sap_ctx->channel,
sap_ctx->secondary_ch, &sap_ctx->ch_params);
}
if (sap_ctx->channel > 14 &&
(sap_ctx->csr_roamProfile.phyMode == eCSR_DOT11_MODE_11g ||
@@ -3499,13 +3498,12 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
* Radar found while performing channel availability
* check, need to switch the channel again
*/
eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
"ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n");
if (mac_ctx->sap.SapDfsInfo.target_channel) {
sme_set_ch_params(hal, phymode,
mac_ctx->sap.SapDfsInfo.target_channel, 0,
&sap_ctx->ch_params);
cds_set_channel_params(
mac_ctx->sap.SapDfsInfo.target_channel, 0,
&sap_ctx->ch_params);
}
for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {

17
core/sap/src/sap_module.c
View File

@@ -1565,13 +1565,8 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
new_ch_params.ch_width,
target_bw);
}
sme_set_ch_params(hHal,
sapContext->csr_roamProfile.phyMode,
targetChannel,
0,
&pMac->sap.SapDfsInfo.new_ch_params);
cds_set_channel_params(targetChannel,
0, &pMac->sap.SapDfsInfo.new_ch_params);
/*
* Set the CSA IE required flag.
*/
@@ -2303,7 +2298,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
* which will result in channel width changing dynamically.
*/
ch_params = &mac_ctx->sap.SapDfsInfo.new_ch_params;
sme_set_ch_params(hHal, phy_mode, target_channel, 0, ch_params);
cds_set_channel_params(target_channel, 0, ch_params);
sapContext->ch_params.ch_width = ch_params->ch_width;
/* Update the channel as this will be used to
* send event to supplicant
@@ -2445,10 +2440,8 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
pMac->sap.SapDfsInfo.new_ch_params.ch_width =
pMac->sap.SapDfsInfo.new_chanWidth;
sme_set_ch_params(hHal, sapContext->csr_roamProfile.phyMode,
pMac->sap.SapDfsInfo.target_channel, 0,
&pMac->sap.SapDfsInfo.new_ch_params);
cds_set_channel_params(pMac->sap.SapDfsInfo.target_channel,
0, &pMac->sap.SapDfsInfo.new_ch_params);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
"%s: chan:%d req:%d width:%d off:%d",