qcacld: UMAC: Consistently use enumeration from CSR for phy mode

Currently we have phymode enumeration done at SAP and CSR with
different values. This causes confusion during conversion from
one form to the other.

This change set fix this issue by merging enumeration at CSR and SAP
into one in CSR. This change set also removes eCSR_DOT11_MODE_11a_ONLY
mode which is unused.

Change-Id: I17f9faadd6f4d6c746965bf6fb588387238813bf
CRs-Fixed: 772165

16 files changed, 72 insertions, 169 deletions

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 840a6c34eec0..a9b6132b9c32 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1978,9 +1978,9 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs
                       default_sap_channel);
         }
         sme_SelectCBMode(WLAN_HDD_GET_HAL_CTX(sap_adapter),
-        sapConvertSapPhyModeToCsrPhyMode(hdd_ap_ctx->sapConfig.SapHw_mode),
-                                         hdd_ap_ctx->sapConfig.channel,
-                                         pHddCtx->cfg_ini->vhtChannelWidth);
+                         hdd_ap_ctx->sapConfig.SapHw_mode,
+                         hdd_ap_ctx->sapConfig.channel,
+                         pHddCtx->cfg_ini->vhtChannelWidth);
         /*
          * Create a workqueue and let the workqueue handle the restarting
          * sap task. if we directly call sap restart function without
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 73e0cfca4bf2..bdf9a4cd24e3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5786,7 +5786,7 @@ static int wlan_hdd_rate_is_11g(u8 rate)
 
 /* Check for 11g rate and set proper 11g only mode */
 static void wlan_hdd_check_11gmode(u8 *pIe, u8* require_ht,
-                     u8* pCheckRatesfor11g, eSapPhyMode* pSapHw_mode)
+                     u8* pCheckRatesfor11g, eCsrPhyMode* pSapHw_mode)
 {
     u8 i, num_rates = pIe[0];
 
@@ -5796,13 +5796,13 @@ static void wlan_hdd_check_11gmode(u8 *pIe, u8* require_ht,
         if( *pCheckRatesfor11g && (TRUE == wlan_hdd_rate_is_11g(pIe[i] & RATE_MASK)))
         {
             /* If rate set have 11g rate than change the mode to 11G */
-            *pSapHw_mode = eSAP_DOT11_MODE_11g;
+            *pSapHw_mode = eCSR_DOT11_MODE_11g;
             if (pIe[i] & BASIC_RATE_MASK)
             {
                 /* If we have 11g rate as  basic rate, it means mode
                    is 11g only mode.
                  */
-               *pSapHw_mode = eSAP_DOT11_MODE_11g_ONLY;
+               *pSapHw_mode = eCSR_DOT11_MODE_11g_ONLY;
                *pCheckRatesfor11g = FALSE;
             }
         }
@@ -5823,7 +5823,7 @@ static void wlan_hdd_set_sapHwmode(hdd_adapter_t *pHostapdAdapter)
     u8 require_ht = FALSE;
     u8 *pIe=NULL;
 
-    pConfig->SapHw_mode= eSAP_DOT11_MODE_11b;
+    pConfig->SapHw_mode= eCSR_DOT11_MODE_11b;
 
     pIe = wlan_hdd_cfg80211_get_ie_ptr(&pMgmt_frame->u.beacon.variable[0],
                                        pBeacon->head_len, WLAN_EID_SUPP_RATES);
@@ -5846,7 +5846,7 @@ static void wlan_hdd_set_sapHwmode(hdd_adapter_t *pHostapdAdapter)
 
     if( pConfig->channel > 14 )
     {
-        pConfig->SapHw_mode= eSAP_DOT11_MODE_11a;
+        pConfig->SapHw_mode= eCSR_DOT11_MODE_11a;
     }
 
     pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
@@ -5854,9 +5854,9 @@ static void wlan_hdd_set_sapHwmode(hdd_adapter_t *pHostapdAdapter)
 
     if(pIe)
     {
-        pConfig->SapHw_mode= eSAP_DOT11_MODE_11n;
+        pConfig->SapHw_mode= eCSR_DOT11_MODE_11n;
         if(require_ht)
-            pConfig->SapHw_mode= eSAP_DOT11_MODE_11n_ONLY;
+            pConfig->SapHw_mode= eCSR_DOT11_MODE_11n_ONLY;
     }
 }
 
@@ -6984,16 +6984,16 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
     /* Overwrite the hostapd setting for HW mode only for 11ac.
      * This is valid only if mode is set to 11n in hostapd and either AUTO or 11ac in .ini .
      * Otherwise, leave whatever is set in hostapd (a OR b OR g OR n mode) */
-    if( (pConfig->SapHw_mode == eSAP_DOT11_MODE_11n) &&
+    if( (pConfig->SapHw_mode == eCSR_DOT11_MODE_11n) &&
          sapForce11ACFor11n &&
         (( (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;
+            pConfig->SapHw_mode = eCSR_DOT11_MODE_11ac_ONLY;
         else
-            pConfig->SapHw_mode = eSAP_DOT11_MODE_11ac;
+            pConfig->SapHw_mode = eCSR_DOT11_MODE_11ac;
 
         /* If ACS disable and selected channel <= 14
              OR
@@ -7015,7 +7015,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
                                                                  == FALSE)) ||
             (WLAN_HDD_GET_CTX(pHostapdAdapter)->isVHT80Allowed == FALSE))
         {
-            pConfig->SapHw_mode = eSAP_DOT11_MODE_11n;
+            pConfig->SapHw_mode = eCSR_DOT11_MODE_11n;
         }
     }
 #endif
@@ -7023,7 +7023,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
     if ( AUTO_CHANNEL_SELECT != pConfig->channel )
     {
         sme_SelectCBMode(hHal,
-            sapConvertSapPhyModeToCsrPhyMode(pConfig->SapHw_mode),
+            pConfig->SapHw_mode,
             pConfig->channel,
             WLAN_HDD_GET_CTX(pHostapdAdapter)->cfg_ini->vhtChannelWidth);
     }
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 6a3d9e6292ce..9dc7598ebc59 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -2556,12 +2556,12 @@ static iw_softap_setparam(struct net_device *dev,
                 if (set_value != 0xff) {
                     rix = RC_2_RATE_IDX(set_value);
                     if (set_value & 0x80) {
-                        if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11b ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_11b_ONLY ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_11g ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_11g_ONLY ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_abg ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_11a) {
+                        if (pConfig->SapHw_mode == eCSR_DOT11_MODE_11b ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_11b_ONLY ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_11g ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_11g_ONLY ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_abg ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_11a) {
                             hddLog(LOGE, "Not valid mode for HT");
                             ret = -EIO;
                             break;
@@ -2569,7 +2569,7 @@ static iw_softap_setparam(struct net_device *dev,
                         preamble = WMI_RATE_PREAMBLE_HT;
                         nss = HT_RC_2_STREAMS(set_value) - 1;
                     } else if (set_value & 0x10) {
-                        if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11a) {
+                        if (pConfig->SapHw_mode == eCSR_DOT11_MODE_11a) {
                             hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid for cck");
                             ret = -EIO;
                             break;
@@ -2579,8 +2579,8 @@ static iw_softap_setparam(struct net_device *dev,
                         if (rix != 0x3)
                             rix |= 0x4;
                     } else {
-                        if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11b ||
-                            pConfig->SapHw_mode == eSAP_DOT11_MODE_11b_ONLY) {
+                        if (pConfig->SapHw_mode == eCSR_DOT11_MODE_11b ||
+                            pConfig->SapHw_mode == eCSR_DOT11_MODE_11b_ONLY) {
                             hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid for OFDM");
                             ret = -EIO;
                             break;
@@ -2604,8 +2604,8 @@ static iw_softap_setparam(struct net_device *dev,
                 tsap_Config_t *pConfig =
                     &pHostapdAdapter->sessionCtx.ap.sapConfig;
 
-                if (pConfig->SapHw_mode != eSAP_DOT11_MODE_11ac &&
-                    pConfig->SapHw_mode != eSAP_DOT11_MODE_11ac_ONLY) {
+                if (pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac &&
+                    pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac_ONLY) {
                     hddLog(VOS_TRACE_LEVEL_ERROR,
                         "%s: SET_VHT_RATE error: SapHw_mode= 0x%x, ch = %d",
                         __func__, pConfig->SapHw_mode, pConfig->channel);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5bd9fc7cee23..97eb0dcdafe2 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -14210,9 +14210,9 @@ void wlan_hdd_check_sta_ap_concurrent_ch_intf(void *data)
 
     pHddApCtx->sapConfig.channel = intf_ch;
     sme_SelectCBMode(hHal,
-            sapConvertSapPhyModeToCsrPhyMode(pHddApCtx->sapConfig.SapHw_mode),
-                                             pHddApCtx->sapConfig.channel,
-                                             pHddCtx->cfg_ini->vhtChannelWidth);
+                     pHddApCtx->sapConfig.SapHw_mode,
+                     pHddApCtx->sapConfig.channel,
+                     pHddCtx->cfg_ini->vhtChannelWidth);
     wlan_hdd_restart_sap(ap_adapter);
 }
 #endif
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 92bd73ec2985..feda7b6cc6a4 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7644,7 +7644,6 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i
                 snprintf(extra, WE_MAX_STR_LEN, "11ABG");
                 break;
            case eCSR_DOT11_MODE_11a:
-           case eCSR_DOT11_MODE_11a_ONLY:
                 snprintf(extra, WE_MAX_STR_LEN, "11A");
                 break;
            case eCSR_DOT11_MODE_11b:
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index 42e5d3c84b6b..add56382c0f9 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -147,21 +147,6 @@ typedef enum{
 }eSapReasonCode;
 
 typedef enum {
-    eSAP_DOT11_MODE_abg = 0x0001,
-    eSAP_DOT11_MODE_11a = 0x0002,
-    eSAP_DOT11_MODE_11b = 0x0004,
-    eSAP_DOT11_MODE_11g = 0x0008,
-    eSAP_DOT11_MODE_11n = 0x0010,
-    eSAP_DOT11_MODE_11g_ONLY = 0x0080,
-    eSAP_DOT11_MODE_11n_ONLY = 0x0100,
-    eSAP_DOT11_MODE_11b_ONLY = 0x0400,
-#ifdef WLAN_FEATURE_11AC
-    eSAP_DOT11_MODE_11ac     = 0x1000,
-    eSAP_DOT11_MODE_11ac_ONLY = 0x2000
-#endif
-} eSapPhyMode;
-
-typedef enum {
     eSAP_ACCEPT_UNLESS_DENIED = 0,
     eSAP_DENY_UNLESS_ACCEPTED = 1,
     eSAP_SUPPORT_ACCEPT_AND_DENY = 2, /* this type is added to support both accept and deny lists at the same time */
@@ -456,7 +441,7 @@ typedef __ani_attr_pre_packed struct sap_SSIDInfo {
 
 typedef struct sap_Config {
     tSap_SSIDInfo_t SSIDinfo;
-    eSapPhyMode     SapHw_mode; /* Wireless Mode */
+    eCsrPhyMode     SapHw_mode; /* Wireless Mode */
     eSapMacAddrACL  SapMacaddr_acl;
     v_MACADDR_t     accept_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */
     v_BOOL_t        ieee80211d;      /*Specify if 11D is enabled or disabled*/
@@ -2222,23 +2207,6 @@ VOS_STATUS
 WLANSAP_ResetSapConfigAddIE(tsap_Config_t *pConfig,
                             eUpdateIEsType updateType);
 
-
-
-/*==========================================================================
-FUNCTION  sapConvertSapPhyModeToCsrPhyMode
-
-DESCRIPTION Function to implement selection of CSR PhyMode using SAP PhyMode
-
-DEPENDENCIES PARAMETERS
-
-IN sapPhyMode : SAP Phy Module
-
-RETURN VALUE If SUCCESS or FAILURE
-
-SIDE EFFECTS
-============================================================================*/
-eCsrPhyMode sapConvertSapPhyModeToCsrPhyMode( eSapPhyMode sapPhyMode );
-
 /*==========================================================================
 FUNCTION  WLANSAP_extend_to_acs_range
 
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 550563061596..ab82a867b59c 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -247,8 +247,8 @@ WLANSAP_ScanCallback
     }
 
     sme_SelectCBMode(halHandle,
-          sapConvertSapPhyModeToCsrPhyMode(psapContext->csrRoamProfile.phyMode),
-          psapContext->channel, vhtChannelWidth);
+                     psapContext->csrRoamProfile.phyMode,
+                     psapContext->channel, vhtChannelWidth);
 #ifdef SOFTAP_CHANNEL_RANGE
     if(psapContext->channelList != NULL)
     {
@@ -442,12 +442,12 @@ WLANSAP_PreStartBssAcsScanCallback
         }
 
         sme_SelectCBMode(halHandle,
-          sapConvertSapPhyModeToCsrPhyMode(psapContext->csrRoamProfile.phyMode),
-          psapContext->channel, vhtChannelWidth);
+                         psapContext->csrRoamProfile.phyMode,
+                         psapContext->channel, vhtChannelWidth);
 
         /* determine secondary channel for 11n mode */
-        if ((eSAP_DOT11_MODE_11n == psapContext->csrRoamProfile.phyMode) ||
-            (eSAP_DOT11_MODE_11n_ONLY == psapContext->csrRoamProfile.phyMode)) {
+        if ((eCSR_DOT11_MODE_11n == psapContext->csrRoamProfile.phyMode) ||
+            (eCSR_DOT11_MODE_11n_ONLY == psapContext->csrRoamProfile.phyMode)) {
             ePhyChanBondState cbMode;
 
             if (psapContext->channel > 14)
@@ -1076,8 +1076,7 @@ WLANSAP_RoamCallback
         case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS:
         case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE:
         {
-            eCsrPhyMode phyMode =
-               sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode);
+            eCsrPhyMode phyMode = sapContext->csrRoamProfile.phyMode;
 
             /* Both success and failure cases are handled intentionally handled
              * together. Irrespective of whether the channel switch IE was
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 836ca58ac794..a8be01506af9 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -2330,7 +2330,7 @@ void sapSortChlWeightAll(ptSapContext pSapCtx,
 }
 
 eChannelWidthInfo sapGetChannelWidthInfo(tHalHandle halHandle, ptSapContext pSapCtx,
-                                 v_U32_t operatingBand, eSapPhyMode phyMode)
+                                 v_U32_t operatingBand, eCsrPhyMode phyMode)
 {
     v_U32_t cbMode;
     eChannelWidthInfo chWidth = CHWIDTH_HT20;
@@ -2343,16 +2343,16 @@ eChannelWidthInfo sapGetChannelWidthInfo(tHalHandle halHandle, ptSapContext pSap
                   "%s: cbMode=%d, phyMode=%d",
                __func__, cbMode, phyMode);
 
-    if (phyMode == eSAP_DOT11_MODE_11n ||
-        phyMode == eSAP_DOT11_MODE_11n_ONLY)
+    if (phyMode == eCSR_DOT11_MODE_11n ||
+        phyMode == eCSR_DOT11_MODE_11n_ONLY)
     {
         if (cbMode)
             chWidth = CHWIDTH_HT40;
         else
             chWidth = CHWIDTH_HT20;
     }
-    else if (pSapCtx->csrRoamProfile.phyMode == eCSR_CFG_DOT11_MODE_11AC ||
-        pSapCtx->csrRoamProfile.phyMode == eCSR_CFG_DOT11_MODE_11AC_ONLY) {
+    else if (pSapCtx->csrRoamProfile.phyMode == eCSR_DOT11_MODE_11ac ||
+        pSapCtx->csrRoamProfile.phyMode == eCSR_DOT11_MODE_11ac_ONLY) {
         chWidth = CHWIDTH_HT80;
     }
     else {
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 4b53d07082aa..e87a1c7d719a 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -2077,8 +2077,7 @@ sapGotoChannelSel
                          PMAC_STRUCT(hHal)->roam.configParam.nVhtChannelWidth;
               }
               sme_SelectCBMode(hHal,
-                               sapConvertSapPhyModeToCsrPhyMode(
-                                       sapContext->csrRoamProfile.phyMode),
+                               sapContext->csrRoamProfile.phyMode,
                                channel, vhtChannelWidth);
 
         }
@@ -3362,8 +3361,7 @@ sapFsm
 
                      con_ch = sme_CheckConcurrentChannelOverlap(hHal,
                                         sapContext->channel,
-                                        sapConvertSapPhyModeToCsrPhyMode(
-                                        sapContext->csrRoamProfile.phyMode),
+                                        sapContext->csrRoamProfile.phyMode,
                                         sapContext->cc_switch_mode);
                      if (con_ch)
                      {
@@ -3384,9 +3382,7 @@ sapFsm
                          vhtChannelWidth =
                                    pMac->roam.configParam.nVhtChannelWidth;
                       }
-                      sme_SelectCBMode(hHal,
-                                       sapConvertSapPhyModeToCsrPhyMode(
-                                            sapContext->csrRoamProfile.phyMode),
+                      sme_SelectCBMode(hHal, sapContext->csrRoamProfile.phyMode,
                                        sapContext->channel, vhtChannelWidth);
 
                      }
@@ -3449,17 +3445,15 @@ sapFsm
                          vhtChannelWidth =
                                    pMac->roam.configParam.nVhtChannelWidth;
                       }
-                      sme_SelectCBMode(hHal,
-                                       sapConvertSapPhyModeToCsrPhyMode(
-                                            sapContext->csrRoamProfile.phyMode),
+                      sme_SelectCBMode(hHal, sapContext->csrRoamProfile.phyMode,
                                        sapContext->channel, vhtChannelWidth);
                  }
                  if (sapContext->channel > 14 &&
                          (sapContext->csrRoamProfile.phyMode ==
-                         eSAP_DOT11_MODE_11g ||
+                         eCSR_DOT11_MODE_11g ||
                          sapContext->csrRoamProfile.phyMode ==
-                         eSAP_DOT11_MODE_11g_ONLY))
-                     sapContext->csrRoamProfile.phyMode = eSAP_DOT11_MODE_11a;
+                         eCSR_DOT11_MODE_11g_ONLY))
+                     sapContext->csrRoamProfile.phyMode = eCSR_DOT11_MODE_11a;
 
 #ifdef WLAN_FEATURE_MBSSID
                  /* when AP2 is started while AP1 is performing ACS, we may not
@@ -3489,9 +3483,9 @@ sapFsm
                          __func__, sapContext->channel);
                  if (sapContext->apAutoChannelSelection &&
                      (sapContext->csrRoamProfile.phyMode ==
-                                                   eSAP_DOT11_MODE_11n ||
+                                                   eCSR_DOT11_MODE_11n ||
                       sapContext->csrRoamProfile.phyMode ==
-                                                   eSAP_DOT11_MODE_11n_ONLY)) {
+                                                   eCSR_DOT11_MODE_11n_ONLY)) {
                      tSap_Event sapApAppEvent;
                      sapApAppEvent.sapHddEventCode = eSAP_CHANNEL_CHANGE_EVENT;
                      sapApAppEvent.sapevt.sapChannelChange.operatingChannel =
@@ -3531,8 +3525,7 @@ sapFsm
                /* Radar found while performing channel availability
                 * check, need to switch the channel again
                 */
-               eCsrPhyMode phyMode =
-                  sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode);
+               eCsrPhyMode phyMode = sapContext->csrRoamProfile.phyMode;
                tHalHandle hHal =
                   (tHalHandle)vos_get_context(VOS_MODULE_ID_SME, sapContext->pvosGCtx);
 
@@ -3940,8 +3933,7 @@ sapconvertToCsrProfile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType, t
     //set the phyMode to accept anything
     //Best means everything because it covers all the things we support
     /*eCSR_DOT11_MODE_BEST*/
-    profile->phyMode =
-           sapConvertSapPhyModeToCsrPhyMode(pconfig_params->SapHw_mode);
+    profile->phyMode = pconfig_params->SapHw_mode;
 
     //Configure beaconInterval
     profile->beaconInterval = (tANI_U16)pconfig_params->beacon_int;
@@ -4015,41 +4007,6 @@ sapconvertToCsrProfile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType, t
     return eSAP_STATUS_SUCCESS; /* Success. */
 }
 
-/**
- * FUNCTION: sapConvertSapPhyModeToCsrPhyMode
- * Called internally by SAP
- */
-eCsrPhyMode sapConvertSapPhyModeToCsrPhyMode( eSapPhyMode sapPhyMode )
-{
-    switch (sapPhyMode)
-    {
-      case (eSAP_DOT11_MODE_abg):
-         return eCSR_DOT11_MODE_abg;
-      case (eSAP_DOT11_MODE_11b):
-         return eCSR_DOT11_MODE_11b;
-      case (eSAP_DOT11_MODE_11g):
-         return eCSR_DOT11_MODE_11g;
-      case (eSAP_DOT11_MODE_11n):
-         return eCSR_DOT11_MODE_11n;
-      case (eSAP_DOT11_MODE_11a):
-         return eCSR_DOT11_MODE_11a;
-      case (eSAP_DOT11_MODE_11g_ONLY):
-         return eCSR_DOT11_MODE_11g_ONLY;
-      case (eSAP_DOT11_MODE_11n_ONLY):
-         return eCSR_DOT11_MODE_11n_ONLY;
-      case (eSAP_DOT11_MODE_11b_ONLY):
-         return eCSR_DOT11_MODE_11b_ONLY;
-#ifdef WLAN_FEATURE_11AC
-      case (eSAP_DOT11_MODE_11ac_ONLY):
-         return eCSR_DOT11_MODE_11ac_ONLY;
-      case (eSAP_DOT11_MODE_11ac):
-         return eCSR_DOT11_MODE_11ac;
-#endif
-      default:
-         return eCSR_DOT11_MODE_AUTO;
-    }
-}
-
 void sapFreeRoamProfile(tCsrRoamProfile *profile)
 {
    if(profile->pRSNReqIE)
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index b0039037f7a9..ff64687110a3 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -3977,9 +3977,9 @@ WLANSAP_ACS_CHSelect(v_PVOID_t pvosGCtx,
         ((pMac->roam.configParam.phyMode == eCSR_DOT11_MODE_abg) ||
          (pMac->roam.configParam.phyMode == eCSR_DOT11_MODE_11a) ||
          (pMac->roam.configParam.phyMode == eCSR_DOT11_MODE_11g)))
-       sapContext->csrRoamProfile.phyMode = eSAP_DOT11_MODE_abg;
+       sapContext->csrRoamProfile.phyMode = eCSR_DOT11_MODE_abg;
     else
-       sapContext->csrRoamProfile.phyMode = eSAP_DOT11_MODE_11n;
+       sapContext->csrRoamProfile.phyMode = eCSR_DOT11_MODE_11n;
 
     if ((pConfig->channel == AUTO_CHANNEL_SELECT) &&
         (sapContext->isScanSessionOpen == eSAP_FALSE)) {
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index f8017dea351e..93fe7ec5cfeb 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -122,9 +122,8 @@ typedef enum
 
 }eCsrSecurityType;
 
-typedef enum
-{
-    eCSR_DOT11_MODE_abg = 0x0001,    //11a/b/g only, no HT, no proprietary
+typedef enum {
+    eCSR_DOT11_MODE_abg = 0x0001, /* 11a/b/g only, no HT, no proprietary */
     eCSR_DOT11_MODE_11a = 0x0002,
     eCSR_DOT11_MODE_11b = 0x0004,
     eCSR_DOT11_MODE_11g = 0x0008,
@@ -132,18 +131,20 @@ typedef enum
     eCSR_DOT11_MODE_11g_ONLY = 0x0020,
     eCSR_DOT11_MODE_11n_ONLY = 0x0040,
     eCSR_DOT11_MODE_11b_ONLY = 0x0080,
-    eCSR_DOT11_MODE_11a_ONLY = 0x0100,
 #ifdef WLAN_FEATURE_11AC
-    eCSR_DOT11_MODE_11ac     = 0x0200,
-    eCSR_DOT11_MODE_11ac_ONLY = 0x0400,
+    eCSR_DOT11_MODE_11ac     = 0x0100,
+    eCSR_DOT11_MODE_11ac_ONLY = 0x0200,
 #endif
-    //This is for WIFI test. It is same as eWNIAPI_MAC_PROTOCOL_ALL except when it starts IBSS in 11B of 2.4GHz
-    //It is for CSR internal use
-    eCSR_DOT11_MODE_AUTO = 0x0800,
+    /*
+     * This is for WIFI test. It is same as eWNIAPI_MAC_PROTOCOL_ALL
+     * except when it starts IBSS in 11B of 2.4GHz
+     * It is for CSR internal use
+     */
+    eCSR_DOT11_MODE_AUTO = 0x0400,
 
-    eCSR_NUM_PHY_MODE = 16,     //specify the number of maximum bits for phyMode
-}eCsrPhyMode;
+    eCSR_NUM_PHY_MODE = 16, /* specify the number of maximum bits for phyMode */
 
+} eCsrPhyMode;
 
 typedef tANI_U8 tCsrBssid[VOS_MAC_ADDR_SIZE];
 
@@ -884,7 +885,8 @@ typedef struct tagCsrRoamProfile
     //that we need to join. Index 1 is the SSID for self BSS.
     tCsrSSIDs SSIDs;
     tCsrBSSIDs BSSIDs;
-    tANI_U32 phyMode;   //this is a bit mask of all the needed phy mode defined in eCsrPhyMode
+    /* this is a bit mask of all the needed phy mode defined in eCsrPhyMode */
+    eCsrPhyMode phyMode;
     eCsrRoamBssType BSSType;
 
     tCsrAuthList AuthType;
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 15283be7d679..bb8aad3662b1 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -1087,8 +1087,7 @@ typedef struct tagCsrRoamStruct
         (eCSR_DOT11_MODE_11g == (pMac)->roam.configParam.phyMode || eCSR_DOT11_MODE_11g_ONLY == (pMac)->roam.configParam.phyMode)
 
 #define CSR_IS_PHY_MODE_A_ONLY(pMac) \
-        ((eCSR_DOT11_MODE_11a == (pMac)->roam.configParam.phyMode) ||\
-        (eCSR_DOT11_MODE_11a_ONLY == (pMac)->roam.configParam.phyMode))
+        (eCSR_DOT11_MODE_11a == (pMac)->roam.configParam.phyMode)
 
 #ifdef WLAN_FEATURE_11AC
 #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 4bfea18957e2..6965efeb01ab 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -2110,7 +2110,7 @@ eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI
         if(eCSR_BAND_24 == eBand)
         {
             if(CSR_IS_RADIO_A_ONLY(pMac)) break;
-            if((eCSR_DOT11_MODE_11a & phyMode) || (eCSR_DOT11_MODE_11a_ONLY & phyMode)) break;
+            if(eCSR_DOT11_MODE_11a & phyMode) break;
         }
         if(eCSR_BAND_5G == eBand)
         {
@@ -2131,13 +2131,6 @@ eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI
                 if(eCSR_DOT11_MODE_11n_ONLY != phyMode) break;
                 newPhyMode = eCSR_DOT11_MODE_11n_ONLY;
             }
-            else if(eCSR_DOT11_MODE_11a_ONLY & phyMode)
-            {
-                if(eCSR_DOT11_MODE_11a_ONLY != phyMode) break;
-                if(eCSR_BAND_24 == eBand) break;
-                newPhyMode = eCSR_DOT11_MODE_11a_ONLY;
-                eBand = eCSR_BAND_5G;
-            }
             else if(eCSR_DOT11_MODE_11g_ONLY & phyMode)
             {
                 if(eCSR_DOT11_MODE_11g_ONLY != phyMode) break;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 6cacf288df9d..ac68fb376b31 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -4822,9 +4822,6 @@ static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription
         case eCSR_DOT11_MODE_11b_ONLY:
             fAllowed = (tANI_BOOLEAN)(eCSR_DOT11_MODE_11b == phyMode);
             break;
-        case eCSR_DOT11_MODE_11a_ONLY:
-            fAllowed = (tANI_BOOLEAN)(eCSR_DOT11_MODE_11a == phyMode);
-            break;
         case eCSR_DOT11_MODE_11n:
 #ifdef WLAN_FEATURE_11AC
         case eCSR_DOT11_MODE_11ac:
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 1a4b22bd2d14..79a4868538f7 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -1658,14 +1658,6 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
             }
             break;
 
-        case eCSR_DOT11_MODE_11a_ONLY:   //11a
-            if( eCSR_DOT11_MODE_11a == bssPhyMode )
-            {
-                fMatch = TRUE;
-                cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
-            }
-            break;
-
         case eCSR_DOT11_MODE_11g:
             if(!f5GhzBand)
             {
@@ -1949,7 +1941,7 @@ eCsrCfgDot11Mode csrFindBestPhyMode( tpAniSirGlobal pMac, tANI_U32 phyMode )
                 cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11G;
             }
         }
-        else if( ( eCSR_DOT11_MODE_11a | eCSR_DOT11_MODE_11a_ONLY ) & phyMode )
+        else if(eCSR_DOT11_MODE_11a & phyMode)
         {
             cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11A;
         }
@@ -5464,7 +5456,6 @@ eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(tCsrRoamProfile *pProfile, eCs
     switch(phyMode)
     {
     case eCSR_DOT11_MODE_11a:
-    case eCSR_DOT11_MODE_11a_ONLY:
         cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
         break;
     case eCSR_DOT11_MODE_11b:
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index d368ce0c3450..a808b0b48c45 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -11722,7 +11722,6 @@ VOS_STATUS sme_SelectCBMode(tHalHandle hHal, eCsrPhyMode eCsrPhyMode,
          eCSR_DOT11_MODE_11n_ONLY != eCsrPhyMode &&
 
          eCSR_DOT11_MODE_11a != eCsrPhyMode &&
-         eCSR_DOT11_MODE_11a_ONLY != eCsrPhyMode &&
 
          eCSR_DOT11_MODE_abg != eCsrPhyMode
       )
@@ -11855,7 +11854,6 @@ VOS_STATUS sme_SelectCBMode(tHalHandle hHal, eCsrPhyMode eCsrPhyMode,
       for 802.11g only phy mode also channel bonding should be zero.
    */
    if (  eCSR_DOT11_MODE_11a == eCsrPhyMode ||
-         eCSR_DOT11_MODE_11a_ONLY == eCsrPhyMode ||
          eCSR_DOT11_MODE_abg == eCsrPhyMode)
    {
       smeConfig.csrConfig.channelBondingMode5GHz =