mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 16:16:15 -04:00
Merge "qcacld-3.0: Allow SAP to come up on DFS channel in SCC mode" into wlan-cld3.driver.lnx.2.0
This commit is contained in:
commit
adbb96be46
3 changed files with 10 additions and 2 deletions
|
|
@ -8326,8 +8326,9 @@ QDF_STATUS hdd_set_policy_mgr_user_cfg(struct hdd_context *hdd_ctx)
|
|||
user_cfg->mcc_to_scc_switch_mode =
|
||||
hdd_ctx->config->WlanMccToSccSwitchMode;
|
||||
user_cfg->sub_20_mhz_enabled = cds_is_sub_20_mhz_enabled();
|
||||
user_cfg->is_sta_sap_scc_allowed_on_dfs_chan =
|
||||
hdd_ctx->config->sta_sap_scc_on_dfs_chan;
|
||||
status = policy_mgr_set_user_cfg(hdd_ctx->hdd_psoc, user_cfg);
|
||||
|
||||
qdf_mem_free(user_cfg);
|
||||
|
||||
return status;
|
||||
|
|
|
|||
|
|
@ -7570,6 +7570,11 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
|
|||
pConfig->chan_switch_hostapd_rate_enabled =
|
||||
iniConfig->chan_switch_hostapd_rate_enabled;
|
||||
|
||||
if (iniConfig->WlanMccToSccSwitchMode !=
|
||||
QDF_MCC_TO_SCC_SWITCH_DISABLE) {
|
||||
pConfig->chan_switch_hostapd_rate_enabled = false;
|
||||
}
|
||||
|
||||
pConfig->enOverLapCh = iniConfig->gEnableOverLapCh;
|
||||
pConfig->dtim_period = pBeacon->dtim_period;
|
||||
pConfig->dfs_beacon_tx_enhanced = iniConfig->dfs_beacon_tx_enhanced;
|
||||
|
|
|
|||
|
|
@ -13855,6 +13855,7 @@ void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
uint8_t Channel;
|
||||
ePhyChanBondState cbMode = PHY_SINGLE_CHANNEL_CENTERED;
|
||||
struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
|
||||
bool skip_hostapd_rate = !pProfile->chan_switch_hostapd_rate_enabled;
|
||||
|
||||
if (!pSession) {
|
||||
sme_err("session %d not found", sessionId);
|
||||
|
|
@ -13870,7 +13871,8 @@ void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
}
|
||||
} else {
|
||||
csr_roam_get_bss_start_parms(pMac, pProfile,
|
||||
&pSession->bssParams, false);
|
||||
&pSession->bssParams,
|
||||
skip_hostapd_rate);
|
||||
/* Use the first SSID */
|
||||
if (pProfile->SSIDs.numOfSSIDs)
|
||||
qdf_mem_copy(&pSession->bssParams.ssId,
|
||||
|
|
|
|||
Loading…
Reference in a new issue