|
@@ -2475,8 +2475,8 @@ static bool policy_mgr_valid_sta_channel_check(struct wlan_objmgr_psoc *psoc,
|
|
|
|
|
|
if ((wlan_reg_is_dfs_for_freq(pm_ctx->pdev, sta_ch_freq) &&
|
|
|
!sta_sap_scc_on_dfs_chan) ||
|
|
|
- wlan_reg_is_passive_or_disable_for_freq(
|
|
|
- pm_ctx->pdev, sta_ch_freq) ||
|
|
|
+ wlan_reg_is_passive_or_disable_for_pwrmode(
|
|
|
+ pm_ctx->pdev, sta_ch_freq, REG_CURRENT_PWR_MODE) ||
|
|
|
(wlan_reg_is_freq_indoor(pm_ctx->pdev, sta_ch_freq) &&
|
|
|
!sta_sap_scc_on_indoor_channel) ||
|
|
|
!policy_mgr_is_safe_channel(psoc, sta_ch_freq)) {
|
|
@@ -2606,8 +2606,10 @@ policy_mgr_valid_sap_conc_channel_check(struct wlan_objmgr_psoc *psoc,
|
|
|
policymgr_nofl_debug("sap not capable on disabled con ch_freq %d",
|
|
|
ch_freq);
|
|
|
} else if (con_mode == PM_P2P_GO_MODE &&
|
|
|
- wlan_reg_is_passive_or_disable_for_freq(pm_ctx->pdev,
|
|
|
- ch_freq) &&
|
|
|
+ wlan_reg_is_passive_or_disable_for_pwrmode(
|
|
|
+ pm_ctx->pdev,
|
|
|
+ ch_freq,
|
|
|
+ REG_CURRENT_PWR_MODE) &&
|
|
|
!(policy_mgr_is_go_scc_strict(psoc) &&
|
|
|
(!is_sta_sap_scc || sta_sap_scc_on_dfs_chan))) {
|
|
|
find_alternate = true;
|