diff options
| author | Edhar, Mahesh Kumar <c_medhar@qti.qualcomm.com> | 2014-07-24 11:13:56 +0530 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-08-04 19:31:51 -0700 |
| commit | 30249d0eb6f17f97f75e087d5c393016f2c576cc (patch) | |
| tree | 70ca86f0b31a2993971f80f6f9e29412b8caa50c | |
| parent | 9f6572d088c05adca343ea602e90223b8e73aafb (diff) | |
Revert "wlan: Add seperate parameter in INI to set SAP HW mode."
This reverts commit c50a6ba80d407d2339092659e8bc040b2bec1e57.
Change-Id: Ib0141174c50cec62785d67e65933584777a5d7ba
CRs-Fixed: 695957
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg.h | 12 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 7 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 8 |
3 files changed, 3 insertions, 24 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index 1af28a67e521..bfb2cdd87e44 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -304,16 +304,6 @@ typedef enum #define CFG_DOT11_MODE_DEFAULT eHDD_DOT11_MODE_11n #endif -#define CFG_SAP_DOT11_MODE_NAME "gSapDot11Mode" -#define CFG_SAP_DOT11_MODE_MIN eHDD_DOT11_MODE_AUTO -#ifdef WLAN_FEATURE_11AC -#define CFG_SAP_DOT11_MODE_MAX eHDD_DOT11_MODE_11ac -#define CFG_SAP_DOT11_MODE_DEFAULT eHDD_DOT11_MODE_11ac -#else -#define CFG_SAP_DOT11_MODE_MAX eHDD_DOT11_MODE_11b_ONLY -#define CFG_SAP_DOT11_MODE_DEFAULT eHDD_DOT11_MODE_11n -#endif - #define CFG_CHANNEL_BONDING_MODE_24GHZ_NAME "gChannelBondingMode24GHz" #define CFG_CHANNEL_BONDING_MODE_MIN WNI_CFG_CHANNEL_BONDING_MODE_STAMIN #define CFG_CHANNEL_BONDING_MODE_MAX WNI_CFG_CHANNEL_BONDING_MODE_STAMAX @@ -3258,8 +3248,6 @@ typedef struct v_BOOL_t debugP2pRemainOnChannel; - eHddDot11Mode sapDot11Mode; - v_BOOL_t enablePacketLog; #ifdef MSM_PLATFORM v_U32_t busBandwidthHighThreshold; diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index ebc47d559ba1..d94a84054ff7 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -3578,13 +3578,6 @@ REG_TABLE_ENTRY g_registry_table[] = CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_MIN, CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_MAX ), - REG_VARIABLE( CFG_SAP_DOT11_MODE_NAME, WLAN_PARAM_Integer, - hdd_config_t, sapDot11Mode, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, - CFG_SAP_DOT11_MODE_DEFAULT, - CFG_SAP_DOT11_MODE_MIN, - CFG_SAP_DOT11_MODE_MAX ), - REG_VARIABLE( CFG_ENABLE_PACKET_LOG, WLAN_PARAM_Integer, hdd_config_t, enablePacketLog, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 19c4cdb8cd6b..55a0877602c1 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -4778,8 +4778,6 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, tSmeConfigParams *psmeConfig; v_BOOL_t MFPCapable = VOS_FALSE; v_BOOL_t MFPRequired = VOS_FALSE; - eHddDot11Mode sapDot11Mode = - (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->sapDot11Mode; u_int16_t prev_rsn_length = 0; ENTER(); @@ -5204,9 +5202,9 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, * Otherwise, leave whatever is set in hostapd (a OR b OR g OR n mode) */ if( ((pConfig->SapHw_mode == eSAP_DOT11_MODE_11n) || (pConfig->SapHw_mode == eSAP_DOT11_MODE_11n_ONLY)) && - (( sapDot11Mode == eHDD_DOT11_MODE_AUTO ) || - ( sapDot11Mode == eHDD_DOT11_MODE_11ac ) || - ( sapDot11Mode == eHDD_DOT11_MODE_11ac_ONLY )) ) + (( (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_AUTO ) || + ( (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac ) || + ( (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY )) ) { if ((WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY) pConfig->SapHw_mode = eSAP_DOT11_MODE_11ac_ONLY; |