summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiangwei Dong <liangwei@qti.qualcomm.com>2016-07-11 03:21:37 -0400
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-07-13 19:03:00 +0530
commit5ff0bb108f5661e449c1ab90e82cd221e4d4022a (patch)
tree8f0eaa997941e70ec0e4e970958386739d486825
parentdbce4b3c15c76be2bb4e619dae354b187c231c25 (diff)
qcacld-2.0: Fix SAP ACS channel selection failure
Start SAP on channel 161 in 5G by ACS. Then kill and restart hostapd in 2.4g by ACS, result is failed. The reason is the sap_config->channel including a stale channel 161, the ACS will be skipped and driver picks up the 161 as ACS result. Hostapd checks that the 161 is not in the 2.4G and fail the start request. The fix is to add back "reset sap_config->channel to 0" code to wlan_hdd_cfg80211_start_acs function, which was removed by an old commit - "I1ba69ed8fdf1c56a90e857054c725b830293d6bf qcacld-2.0: Implement vendor command for ACS policy" Change-Id: Ie9bb6e7125ea47872530d41d383e885c039e22a2 CRs-Fixed: 1040386
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 9456b7faeb74..fa8c537567ea 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7894,6 +7894,10 @@ static int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter)
int status;
sap_config = &adapter->sessionCtx.ap.sapConfig;
+ if (hdd_ctx->acs_policy.acs_channel)
+ sap_config->channel = hdd_ctx->acs_policy.acs_channel;
+ else
+ sap_config->channel = AUTO_CHANNEL_SELECT;
status = wlan_hdd_sap_cfg_dfs_override(adapter);
if (status < 0) {
return status;