From 4298b392d7fceaa905a2344f4fb6d623d1afbdaa Mon Sep 17 00:00:00 2001 From: Rachit Kankane Date: Fri, 15 Sep 2017 16:36:33 +0530 Subject: [PATCH] qcacmn: New value for ini gWlanMccToSccSwitchMode Currently ini variable gWlanMccToSccSwitchMode has 4 values. Value 3 enforces SCC in anycase, if SCC is not possible then switchoff the AP. Added new value 5 for auto specific scenarios where, if SCC is not possible the allow MCC. Change-Id: I584958c6c61f7d1f5e077871e3891bba79f726a3 CRs-Fixed: 2127091 --- qdf/inc/qdf_types.h | 7 +++++++ .../policy_mgr/src/wlan_policy_mgr_get_set_utils.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index 6511438f8765..2b893c075f52 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -575,6 +575,12 @@ void __printf(3, 4) qdf_trace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level, * restart of SAP * @QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL: Switch using fav channel(s) * without SAP restart + * @QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION: Force switch + * without SAP restart. MCC is allowed only in below exception cases: + * Exception Case-1: When STA is operating on DFS channel. + * Exception Case-2: When STA is operating on LTE-CoEx channel. + * Exception Case-3: When STA is operating on AP disabled channel. + * * @QDF_MCC_TO_SCC_SWITCH_MAX: max switch */ typedef enum { @@ -583,6 +589,7 @@ typedef enum { QDF_MCC_TO_SCC_SWITCH_FORCE, QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION, QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL, + QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION, QDF_MCC_TO_SCC_SWITCH_MAX } tQDF_MCC_TO_SCC_SWITCH_MODE; #endif 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 c156881c7028..5f75ab4e6dc0 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 @@ -2672,6 +2672,8 @@ bool policy_mgr_is_force_scc(struct wlan_objmgr_psoc *psoc) return ((pm_ctx->user_cfg.mcc_to_scc_switch_mode == QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION) || - (pm_ctx->user_cfg.mcc_to_scc_switch_mode == - QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL)); + (pm_ctx->user_cfg.mcc_to_scc_switch_mode == + QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) || + (pm_ctx->user_cfg.mcc_to_scc_switch_mode == + QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION)); }