commit 678227a871cfff4be9d164fee476cd27d011bb9f
author Abhishek Singh <absingh@qti.qualcomm.com> Tue Nov 04 10:52:38 2014 +0530
committer AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> Wed Nov 05 18:15:50 2014 +0530
tree e6599120b49f3a7e73ee07910b04cb7f07c73c22
parent cb4d15c90c17125b2ba542534696141d5eaf8ae0

wlan: Handle set band if CONFIG_ENABLE_LINUX_REG is not defined.

vos_is_nv_country_non_zero() and
vos_update_nv_table_from_wiphy_band() function definitions are
under macro but are being called irrespective of macro, thus if
CONFIG_ENABLE_LINUX_REG is not defined set band functionality is
broken.

Removed vos_is_nv_country_non_zero() from the macro, and added a
alternative for vos_update_nv_table_from_wiphy_band() in
hdd_setBand if CONFIG_ENABLE_LINUX_REG=n.

Change-Id: I689a6b21fc76d2045654b0d07ac63d65b7cb5302
CRs-Fixed: 750196

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f6f5a19..42177dc 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4969,12 +4969,7 @@
 
             if (IEEE80211_BAND_2GHZ == i && eCSR_BAND_5G == eBand) // 5G only
             {
-                // Enable Social channels for P2P
-                if (WLAN_HDD_IS_SOCIAL_CHANNEL(band->channels[j].center_freq) &&
-                    NV_CHANNEL_ENABLE == channelEnabledState)
-                    band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
-                else
-                    band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+                band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
                 continue;
             }
             else if (IEEE80211_BAND_5GHZ == i && eCSR_BAND_24 == eBand) // 2G only