summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasti, Narayanraddi <c_nmasti@qti.qualcomm.com>2016-06-07 15:43:35 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-06-09 14:57:38 +0530
commit7c09477cf949042570b7f68ee97c0db8802a1e41 (patch)
tree3200489353e152a0711bc6fbf2f5fe6d3362e7ad
parent4dd8b260c2090ed1df57fbed4967ffe282671752 (diff)
qcacld-2.0: Ensure that phy mode from ini is considered for wlan scan
Regardless of phy mode in ini, 5Ghz band is configured to wiphy which was leading to scan on 5ghz even though phy mode was set to 11b/g. Fix will ensure to configure 5Ghz band if ini supports for 5ghz. Change-Id: Ibf35df89a5bfbbc24f0166878c6aea48838c1a83 CRs-Fixed: 1025261
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 4749917bafe1..98bb836c6bfb 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -11983,9 +11983,9 @@ int wlan_hdd_cfg80211_init(struct device *dev,
&hdd_channels_2_4_GHZ[0],
sizeof(hdd_channels_2_4_GHZ));
if (hdd_is_5g_supported(pHddCtx) &&
- ((eHDD_DOT11_MODE_11b != pCfg->dot11Mode) ||
- (eHDD_DOT11_MODE_11g != pCfg->dot11Mode) ||
- (eHDD_DOT11_MODE_11b_ONLY != pCfg->dot11Mode) ||
+ ((eHDD_DOT11_MODE_11b != pCfg->dot11Mode) &&
+ (eHDD_DOT11_MODE_11g != pCfg->dot11Mode) &&
+ (eHDD_DOT11_MODE_11b_ONLY != pCfg->dot11Mode) &&
(eHDD_DOT11_MODE_11g_ONLY != pCfg->dot11Mode)))
{
wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;