diff options
| author | gaurank kathpalia <gkathpal@codeaurora.org> | 2020-12-04 09:36:58 +0530 |
|---|---|---|
| committer | Paul Chen <chenpaul@google.com> | 2020-12-15 09:33:47 +0000 |
| commit | 72fd3bf997e098dce9f4ad4d446f033df2b56378 (patch) | |
| tree | 1ef91454b077eaaae0ef63d2092a85df5436f5b0 /core | |
| parent | 1ab102d875b48c5020ec6c65c7a8ac84c951b7ab (diff) | |
| download | qcacld-72fd3bf997e098dce9f4ad4d446f033df2b56378.tar.gz | |
qcacld-3.0: Check for ANY mode also in case of ACS override
Currently the driver checks for A for 5ghz and
B, G for 2.4ghz to override the channel in case of
ACS override to STA channel, but in case of hwmode
ANY also channels are possible to be overriden.
Fix is to put a check of HW MODE as ANY also along
with concurrent channel of STA.
Change-Id: I538a9b7dd2102dc3d6489ed719f9dae91d00dc82
CRs-Fixed: 2829498
Bug: 174373049
Signed-off-by: Srinivas Girigowda <quic_sgirigow@quicinc.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index d3553eb76b..d9e430f135 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2654,10 +2654,12 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, 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_IEEE80211A || + sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211ANY)) || (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_IEEE80211G || + 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); |