commit 7dc032733be10a69aea0d32e163a33bd6d79fd5e
author Sushant Kaushik <skaushik@qti.qualcomm.com> Wed Feb 18 11:25:12 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Tue Feb 24 23:21:24 2015 +0530
tree 9c0519d344af9d1b0b4dacb01141143d8669e883
parent 5afc81007c8e2d3b6131ac95fa258b2bf26ae1ce

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

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 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;