diff options
| author | Ganesh Kondabattini <ganeshk@qti.qualcomm.com> | 2016-06-25 12:42:13 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-06-28 19:55:20 +0530 |
| commit | feb330d8606bf99af8b20a342ff0dda5e077d35b (patch) | |
| tree | 1cb33f05033b5a41c2faca7c95f8a73d79c93c2c | |
| parent | b2a670924c1f8cb5a08bfcb7aba2fcd9e4bc7660 (diff) | |
qcacld-2.0: Consider ACS override params only if ACS is enabled
Consider the parameters 'acs_channel' and 'acs_dfs_mode' only
when ACS is enabled for that SAP. Otherwise driver is going to
override the channel even if user configures a fixed channel in
hostapd.conf file.
Change-Id: Ibe24828690ace91338ade10fd00c49fc4acdbd81
CRs-Fixed: 1026420
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 0e7794f94521..b15735a861bb 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -13520,10 +13520,25 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->dtim_period = pBeacon->dtim_period; - if (pHddCtx->acs_policy.acs_channel) - pConfig->channel = pHddCtx->acs_policy.acs_channel; - mode = pHddCtx->acs_policy.acs_dfs_mode; - pConfig->acs_dfs_mode = wlan_hdd_get_dfs_mode(mode); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, FL("acs_mode %d"), + pConfig->acs_cfg.acs_mode); + + if (pConfig->acs_cfg.acs_mode == true) { + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, + FL("acs_channel %d, acs_dfs_mode %d"), + pHddCtx->acs_policy.acs_channel, + pHddCtx->acs_policy.acs_dfs_mode); + + if (pHddCtx->acs_policy.acs_channel) + pConfig->channel = pHddCtx->acs_policy.acs_channel; + + mode = pHddCtx->acs_policy.acs_dfs_mode; + pConfig->acs_dfs_mode = wlan_hdd_get_dfs_mode(mode); + } + + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, + FL("pConfig->channel %d, pConfig->acs_dfs_mode %d"), + pConfig->channel, pConfig->acs_dfs_mode); hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"****pConfig->dtim_period=%d***", pConfig->dtim_period); |