wlan: Rename ini parameter "gsapDot11Mode" to make it meaningful.
Currently gsapDot11Mode is used to enable 11AC mode for SAP.
But the name suggests that it can be used to change dot11mode
for SAP which is not the case. AS a part of fix, change its
name to make it purposive to its behavior.
Change-Id: Ief1fb3421431fb65434bd037b9c2e417ecc88187
CRs-Fixed: 796462
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index f26a6be..3867d36 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -312,15 +312,10 @@
#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_SAP_ENABLE_11AC_NAME "gSapEnable11AC"
+#define CFG_SAP_ENABLE_11AC_MIN ( 0 )
+#define CFG_SAP_ENABLE_11AC_MAX ( 1 )
+#define CFG_SAP_ENABLE_11AC_DEFAULT ( 1 )
#define CFG_CHANNEL_BONDING_MODE_24GHZ_NAME "gChannelBondingMode24GHz"
#define CFG_CHANNEL_BONDING_MODE_MIN WNI_CFG_CHANNEL_BONDING_MODE_STAMIN
@@ -2859,7 +2854,7 @@
v_BOOL_t gEnableStrictRegulatoryForFCC;
v_BOOL_t advertiseConcurrentOperation;
v_U32_t defaultRateIndex24Ghz;
- eHddDot11Mode sapDot11Mode;
+ v_BOOL_t sapEnable11AC;
v_BOOL_t cfgRAFilterEnable;
v_U16_t cfgRARateLimitInterval;
v_U8_t allowDFSChannelRoam;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 57f4c92..9d4eda9 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3003,12 +3003,12 @@
CFG_DEFAULT_RATE_INDEX_24GH_MIN,
CFG_DEFAULT_RATE_INDEX_24GH_MAX ),
- REG_VARIABLE( CFG_SAP_DOT11_MODE_NAME, WLAN_PARAM_Integer,
- hdd_config_t, sapDot11Mode,
+ REG_VARIABLE( CFG_SAP_ENABLE_11AC_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, sapEnable11AC,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
- CFG_SAP_DOT11_MODE_DEFAULT,
- CFG_SAP_DOT11_MODE_MIN,
- CFG_SAP_DOT11_MODE_MAX ),
+ CFG_SAP_ENABLE_11AC_DEFAULT,
+ CFG_SAP_ENABLE_11AC_MIN,
+ CFG_SAP_ENABLE_11AC_MAX ),
REG_VARIABLE(CFG_RA_FILTER_ENABLE_NAME, WLAN_PARAM_Integer,
hdd_config_t, cfgRAFilterEnable,
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a9e7e96..de92228 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6621,9 +6621,8 @@
tSmeConfigParams *psmeConfig;
v_BOOL_t MFPCapable = VOS_FALSE;
v_BOOL_t MFPRequired = VOS_FALSE;
- eHddDot11Mode sapDot11Mode =
- (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->sapDot11Mode;
-
+ v_BOOL_t sapEnable11AC =
+ (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->sapEnable11AC;
ENTER();
iniConfig = pHddCtx->cfg_ini;
@@ -6917,17 +6916,14 @@
#ifdef WLAN_FEATURE_11AC
/* Overwrite the hostapd setting for HW mode only for 11ac.
- * This is valid only if mode is set to 11n in hostapd, either AUTO or
- * 11ac in .ini and 11ac is supported by both host and firmware.
+ * This is valid only if mode is set to 11n in hostapd, sapEnable11AC
+ * is set in .ini and 11ac is supported by both host and firmware.
* 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 ) ) &&
- (sme_IsFeatureSupportedByDriver(DOT11AC)) &&
- (sme_IsFeatureSupportedByFW(DOT11AC)) )
+ (sapEnable11AC) && (sme_IsFeatureSupportedByDriver(DOT11AC)) &&
+ (sme_IsFeatureSupportedByFW(DOT11AC)) )
{
v_U32_t operatingBand = 0;
pConfig->SapHw_mode = eSAP_DOT11_MODE_11ac;