From 93b3c7fdba0d11bff4afcbe59bbc692ed9a61d0f Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Thu, 23 Aug 2018 21:46:44 +0530 Subject: [PATCH] qcacmn: Add SRD channel check in restart SAP Currently the driver doesn't have a check to bring up a SAP on STA SCC channel if its a SRD channel and does force SCC on it, even if SRD master mode is not supported. Fix is to check the SRD ini before SAP bringup on the STA channel. Change-Id: I850d8b252afb20d9e4374e1fb4932d7ef17f3e51 CRs-Fixed: 2302742 --- src/wlan_policy_mgr_action.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wlan_policy_mgr_action.c b/src/wlan_policy_mgr_action.c index 191384b81f07..ab5dff442c96 100644 --- a/src/wlan_policy_mgr_action.c +++ b/src/wlan_policy_mgr_action.c @@ -1448,10 +1448,11 @@ QDF_STATUS policy_mgr_valid_sap_conc_channel_check( if (policy_mgr_valid_sta_channel_check(psoc, channel)) { if (wlan_reg_is_dfs_ch(pm_ctx->pdev, channel) || - wlan_reg_is_passive_or_disable_ch( - pm_ctx->pdev, channel) || + wlan_reg_is_passive_or_disable_ch(pm_ctx->pdev, channel) || !(policy_mgr_sta_sap_scc_on_lte_coex_chan(psoc) || - policy_mgr_is_safe_channel(psoc, channel))) { + policy_mgr_is_safe_channel(psoc, channel)) || + (!reg_is_etsi13_srd_chan_allowed_master_mode(pm_ctx->pdev) + && reg_is_etsi13_srd_chan(pm_ctx->pdev, channel))) { if (wlan_reg_is_dfs_ch(pm_ctx->pdev, channel) && sta_sap_scc_on_dfs_chan) { policy_mgr_debug("STA SAP SCC is allowed on DFS channel");