summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Kumar <quic_rajekuma@quicinc.com>2020-12-16 21:05:56 +0530
committerchenpaul <chenpaul@google.com>2020-12-17 07:32:09 +0800
commitb942febe4fc85f2050ad09fc0cabb8783b1b729c (patch)
tree749647427398c9483505d5948b54bec9b91edd51
parentab05702605eff31ce9ca4b9b9d39b49f76888ce8 (diff)
downloadqcacld-b942febe4fc85f2050ad09fc0cabb8783b1b729c.tar.gz
cld-3.0: Remove check of 11ANY in 5ghz
Currently driver overides the channel list and returns the best channel of the STA to hotapd whenver ACS request is given. But 5ghz band has several checks for DFS master, SRD etc. which should be considered for the SAP startup. Fix is to not override for 5ghz and check for all the params and then only proceed with the override. Change-Id: I70a4614973ffd83beb2c2cb9a0204524c700b4fa CRs-Fixed: 2834322 Bug: 174373049 Signed-off-by: Rajeev Kumar <quic_rajekuma@quicinc.com>
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index d9e430f135..40c57a3292 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -2653,13 +2653,10 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
PM_STA_MODE);
if ((hdd_ctx->config->external_acs_policy ==
HDD_EXTERNAL_ACS_PCL_MANDATORY) && conc_channel) {
- if ((conc_channel >= WLAN_REG_CH_NUM(CHAN_ENUM_36) &&
- (sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211A ||
- sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211ANY)) ||
- (conc_channel <= WLAN_REG_CH_NUM(CHAN_ENUM_14) &&
+ if ((conc_channel <= WLAN_REG_CH_NUM(CHAN_ENUM_14)) &&
(sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211B ||
sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211G ||
- sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211ANY))) {
+ sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211ANY)) {
sap_config->acs_cfg.pri_ch = conc_channel;
wlan_sap_set_sap_ctx_acs_cfg(
WLAN_HDD_GET_SAP_CTX_PTR(adapter), sap_config);