diff --git a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h index 53ec91238654..7782f5c39f39 100644 --- a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h +++ b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h @@ -1057,7 +1057,6 @@ enum policy_mgr_pri_id { * connections * @conc_system_pref: System preference for PCL table * @enable2x2: 2x2 chain mask user config - * @mcc_to_scc_switch_mode: Control SAP channel in concurrency * @sub_20_mhz_enabled: Is 5 or 10 Mhz enabled * @dbs_selection_policy: band preference or Vdev preference * bit[0] = 0: 5G 2x2 preferred to select 2x2 5G + 1x1 2G DBS mode. @@ -1076,7 +1075,6 @@ struct policy_mgr_user_cfg { uint8_t max_concurrent_active_sessions; uint8_t conc_system_pref; bool enable2x2; - uint32_t mcc_to_scc_switch_mode; bool sub_20_mhz_enabled; bool is_sta_sap_scc_allowed_on_dfs_chan; uint32_t channel_select_logic_conc; diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c index 5c1d4a344f6d..ac2ddf75df79 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c @@ -1321,7 +1321,7 @@ static void __policy_mgr_check_sta_ap_concurrent_ch_intf(void *data) goto end; } mcc_to_scc_switch = - policy_mgr_mcc_to_scc_switch_mode_in_user_cfg(psoc); + policy_mgr_get_mcc_to_scc_switch_mode(psoc); policy_mgr_info("Concurrent open sessions running: %d", policy_mgr_concurrent_open_sessions_running(psoc)); @@ -1556,7 +1556,7 @@ void policy_mgr_check_concurrent_intf_and_restart_sap( } mcc_to_scc_switch = - policy_mgr_mcc_to_scc_switch_mode_in_user_cfg(psoc); + policy_mgr_get_mcc_to_scc_switch_mode(psoc); policy_mgr_info("MCC to SCC switch: %d chan: %d", mcc_to_scc_switch, operating_channel[0]); diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c index 6fb55a412f0c..e3f78bba11ce 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c @@ -155,7 +155,7 @@ bool policy_mgr_is_dual_mac_disabled_in_ini( return is_disabled; } -uint32_t policy_mgr_mcc_to_scc_switch_mode_in_user_cfg( +uint32_t policy_mgr_get_mcc_to_scc_switch_mode( struct wlan_objmgr_psoc *psoc) { struct policy_mgr_psoc_priv_obj *pm_ctx; @@ -166,7 +166,7 @@ uint32_t policy_mgr_mcc_to_scc_switch_mode_in_user_cfg( return 0; } - return pm_ctx->user_cfg.mcc_to_scc_switch_mode; + return pm_ctx->cfg.mcc_to_scc_switch; } /** @@ -2402,7 +2402,7 @@ bool policy_mgr_allow_new_home_channel(struct wlan_objmgr_psoc *psoc, return false; } mcc_to_scc_switch = - policy_mgr_mcc_to_scc_switch_mode_in_user_cfg(psoc); + policy_mgr_get_mcc_to_scc_switch_mode(psoc); qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock); if (num_connections == 2) { diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c index 0c65de943518..3891909533b0 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c @@ -3094,13 +3094,13 @@ bool policy_mgr_is_force_scc(struct wlan_objmgr_psoc *psoc) return 0; } - return ((pm_ctx->user_cfg.mcc_to_scc_switch_mode == + return ((pm_ctx->cfg.mcc_to_scc_switch == QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION) || - (pm_ctx->user_cfg.mcc_to_scc_switch_mode == + (pm_ctx->cfg.mcc_to_scc_switch == QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) || - (pm_ctx->user_cfg.mcc_to_scc_switch_mode == + (pm_ctx->cfg.mcc_to_scc_switch == QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION) || - (pm_ctx->user_cfg.mcc_to_scc_switch_mode == + (pm_ctx->cfg.mcc_to_scc_switch == QDF_MCC_TO_SCC_WITH_PREFERRED_BAND)); } diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h index afc03034d421..1be204cfdbaf 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h @@ -355,7 +355,7 @@ bool policy_mgr_is_dual_mac_disabled_in_ini( struct wlan_objmgr_psoc *psoc); /** - * policy_mgr_mcc_to_scc_switch_mode_in_user_cfg() - MCC to SCC + * policy_mgr_get_mcc_to_scc_switch_mode() - MCC to SCC * switch mode value in the user config * @psoc: PSOC object information * @@ -363,7 +363,7 @@ bool policy_mgr_is_dual_mac_disabled_in_ini( * * Return: MCC to SCC switch mode value */ -uint32_t policy_mgr_mcc_to_scc_switch_mode_in_user_cfg( +uint32_t policy_mgr_get_mcc_to_scc_switch_mode( struct wlan_objmgr_psoc *psoc); bool policy_mgr_get_dbs_config(struct wlan_objmgr_psoc *psoc); bool policy_mgr_get_agile_dfs_config(struct wlan_objmgr_psoc *psoc);