diff options
| author | Manjeet Singh <manjee@codeaurora.org> | 2016-09-02 13:31:48 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-09-10 19:06:48 -0700 |
| commit | 2d3b0c58763595cc26aa7157b9dcda4035d6b15e (patch) | |
| tree | 893cd8a831d755dd28a7d2b71c98177931b7ffbb | |
| parent | fb33542c9487dafce52014b828dbdc813bf9ba89 (diff) | |
qcacld-3.0: Avoid Channel 0 in softap acs channel list
qcacld-2.0 to qcacld-3.0 propagation.
If ACS is enabled in hostapd configuration,hostapd sends
a list of channels to HDD for softap bring-up. If hostapd
finds a invalid/unsupported channel in its channel list,
it will send a 0 for that channel. Since HDD always takes
the lowest channel as starting channel for scan, the scan
will always include 2.4Ghz channels even if channel mode
is set to a. Hence HDD should ignore these invalid entries
in channel list.
CRs-fixed: 959490
Change-Id: Iddaf6c4ba14e22b476f22f1f098faf726f4407ec
(cherry picked from commit 9f410939ff801316a153c44c603ce575fe6d15d5)
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index a2ec1b5e16d6..918e4aaa8166 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1302,7 +1302,9 @@ static void wlan_hdd_set_acs_ch_range(tsap_Config_t *sap_cfg, bool ht_enabled, sap_cfg->acs_cfg.end_ch = sap_cfg->acs_cfg.ch_list[sap_cfg->acs_cfg.ch_list_count - 1]; for (i = 0; i < sap_cfg->acs_cfg.ch_list_count; i++) { - if (sap_cfg->acs_cfg.start_ch > sap_cfg->acs_cfg.ch_list[i]) + /* avoid channel as start channel */ + if (sap_cfg->acs_cfg.start_ch > sap_cfg->acs_cfg.ch_list[i] && + sap_cfg->acs_cfg.ch_list[i] != 0) sap_cfg->acs_cfg.start_ch = sap_cfg->acs_cfg.ch_list[i]; if (sap_cfg->acs_cfg.end_ch < sap_cfg->acs_cfg.ch_list[i]) sap_cfg->acs_cfg.end_ch = sap_cfg->acs_cfg.ch_list[i]; |