From 7040d2b4e83a25eebede831d6c3a3d17cc8f4374 Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Tue, 2 Jul 2019 18:02:54 +0530 Subject: [PATCH] qcacld-3.0: Remove redundant init and check in policy_mgr_skip_dfs_ch Remove redundant initialization for local variable dfs_master_capable and always pass check for skip_dfs_channel in policy_mgr_skip_dfs_ch. Change-Id: Icf3ca4e297a54646114d414f1d0bd8543e59ea37 CRs-Fixed: 2482890 --- .../policy_mgr/src/wlan_policy_mgr_pcl.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c index e0bcc6dacbf2..f9dee88e23f7 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c @@ -340,7 +340,7 @@ static QDF_STATUS policy_mgr_skip_dfs_ch(struct wlan_objmgr_psoc *psoc, bool *skip_dfs_channel) { bool sta_sap_scc_on_dfs_chan; - bool dfs_master_capable = true; + bool dfs_master_capable; QDF_STATUS status; status = ucfg_mlme_get_dfs_master_capability(psoc, @@ -355,21 +355,19 @@ static QDF_STATUS policy_mgr_skip_dfs_ch(struct wlan_objmgr_psoc *psoc, policy_mgr_debug("skip DFS ch for SAP/Go dfs master cap %d", dfs_master_capable); *skip_dfs_channel = true; + return QDF_STATUS_SUCCESS; } - if (!*skip_dfs_channel) { - sta_sap_scc_on_dfs_chan = - policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(psoc); - if ((policy_mgr_mode_specific_connection_count(psoc, - PM_STA_MODE, - NULL) > 0) && - !sta_sap_scc_on_dfs_chan) { - policy_mgr_debug("SAP/Go skips DFS ch if sta connects"); - *skip_dfs_channel = true; - } + sta_sap_scc_on_dfs_chan = + policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(psoc); + if ((policy_mgr_mode_specific_connection_count(psoc, PM_STA_MODE, + NULL) > 0) && + !sta_sap_scc_on_dfs_chan) { + policy_mgr_debug("SAP/Go skips DFS ch if sta connects"); + *skip_dfs_channel = true; } - return status; + return QDF_STATUS_SUCCESS; } /**