commit e0ca11f76a559b30a0aae406ab49ec290855003a
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Tue Nov 27 15:57:52 2012 -0800
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 15:19:33 2012 -0800
tree e89c8559dd0bbf9b4580a5df809e847f186afb0a
parent 167b95e8c1102269c15738d71ddb911b739443a3

wlan: Back out changelist 659349. Hostapd settings should overwride the HDD settings.

Backing out this CL as the CR 416489 is not valid.
hostapd settings should overwride the HDD settings.

Change-Id: I1a4f043c480758a8e262799b0e98650f3bde45ca
CR-Fixed: 416489

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 2d5209d..0cca8f4 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1332,7 +1332,6 @@
                                        enum nl80211_hidden_ssid hidden_ssid)
 #endif
 {
-    hdd_config_t  *pConfigIni = ((hdd_context_t *)(pHostapdAdapter->pHddCtx))->cfg_ini;
     tsap_Config_t *pConfig;
     beacon_data_t *pBeacon = NULL;
     struct ieee80211_mgmt *pMgmt_frame;
@@ -1374,8 +1373,7 @@
                                       pConfig->dtim_period);
 
 
-    /* Hdd cfg settings takes preference */
-    if (pConfigIni->Is11dSupportEnabled && (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP))
+    if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP)
     {
         pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
                                        WLAN_EID_COUNTRY);