From 54425cc36898bf95fa213eca2d0748dbf93f1930 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Fri, 2 Jun 2017 16:48:17 -0700 Subject: [PATCH] qcacmn: Disallow moving to single MAC mode when a 2.4GHz connection exist After the P2P GO is up on 2.4 GHZ, the opportunistic upgrade timer handler is sending request to move to single MAC mode. Since 2.4 GHZ connection is always on MAC1 in DBS 2X2 capable HW, this is causing P2P connection failure. Add fix to not downgrade to single MAC mode when there exist a 2.4 GHZ connection. Change-Id: I90e2b5b43a6bc8a5b5b44ea96905410092f2866e CRs-Fixed: 2055867 --- umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c | 8 ++++++++ 1 file changed, 8 insertions(+) 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 1d093b43823a..8c6b08c563f0 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 @@ -200,6 +200,14 @@ enum policy_mgr_conc_next_action policy_mgr_need_opportunistic_upgrade( } else if ((pm_conc_connection_list[conn_index].mac == 1) && pm_conc_connection_list[conn_index].in_use) { mac |= POLICY_MGR_MAC1; + if (policy_mgr_is_hw_dbs_2x2_capable(psoc) && + WLAN_REG_IS_24GHZ_CH( + pm_conc_connection_list[conn_index].chan) + ) { + qdf_mutex_release(&pm_ctx->qdf_conc_list_lock); + policy_mgr_debug("2X2 DBS capable with 2.4 GHZ connection"); + goto done; + } if (POLICY_MGR_MAC0_AND_MAC1 == mac) { qdf_mutex_release(&pm_ctx->qdf_conc_list_lock); goto done;