From 59d68afe2e99f62d4f51145635c1559448f0bf66 Mon Sep 17 00:00:00 2001 From: gaurank kathpalia Date: Thu, 2 Aug 2018 21:23:58 +0530 Subject: [PATCH] qcacmn: Remove dual beacon MCC check from SCC check case In the API policy_mgr_dual_beacon_on_single_mac_scc_capable the check of wmi_service_dual_beacon_on_single_mac_mcc_support is there too, which in any case is void, as if the driver supports SCC, then it will return true from the first check itself, and if it doesn't support SCC, it will surely not support MCC too, so the check of MCC after SCC is void anyways Fix is to remove the check of MCC dual beaconing capability from policy_mgr_dual_beacon_on_single_mac_scc_capable Change-Id: Ia427be4fcee0e0267171d81cf7e8e669560d20a9 CRs-Fixed: 2299182 --- src/wlan_policy_mgr_get_set_utils.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/wlan_policy_mgr_get_set_utils.c b/src/wlan_policy_mgr_get_set_utils.c index 9079e721b02a..c2a1b704bf6f 100644 --- a/src/wlan_policy_mgr_get_set_utils.c +++ b/src/wlan_policy_mgr_get_set_utils.c @@ -3118,16 +3118,10 @@ bool policy_mgr_dual_beacon_on_single_mac_scc_capable( if (wmi_service_enabled( wmi_handle, wmi_service_dual_beacon_on_single_mac_scc_support)) { - policy_mgr_debug("Support dual beacon on same channel on single MAC"); + policy_mgr_debug("Dual beaconing on same channel on single MAC supported"); return true; } - if (wmi_service_enabled( - wmi_handle, - wmi_service_dual_beacon_on_single_mac_mcc_support)) { - policy_mgr_debug("Support dual beacon on both different and same channel on single MAC"); - return true; - } - policy_mgr_debug("Not support dual beacon on same channel on single MAC"); + policy_mgr_debug("Dual beaconing on same channel on single MAC is not supported"); return false; } @@ -3145,10 +3139,10 @@ bool policy_mgr_dual_beacon_on_single_mac_mcc_capable( if (wmi_service_enabled( wmi_handle, wmi_service_dual_beacon_on_single_mac_mcc_support)) { - policy_mgr_debug("Support dual beacon on different channel on single MAC"); + policy_mgr_debug("Dual beaconing on different channel on single MAC supported"); return true; } - policy_mgr_debug("Not support dual beacon on different channel on single MAC"); + policy_mgr_debug("Dual beaconing on different channel on single MAC is not supported"); return false; }