qcacld-3.0: Replace WNI dot11 mode with mlme dot11 mode

As part of CFG ini convergence, remove the macros of WNI
and replace them with the new enums of mlme dot11 mode

Change-Id: Ib7fbf480aa067d02690eb1448c74fcc083d94c59
CRs-Fixed: 2389401

core/mac/inc/sir_mac_prop_exts.h

@@ -36,28 +36,28 @@
 	(((value) >> SIR_MAC_PROP_CAPABILITY_ ## bitname) & 1)
 
 #define IS_DOT11_MODE_HT(dot11Mode) \
-	(((dot11Mode == WNI_CFG_DOT11_MODE_11N) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11N_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AC) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AC_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AX) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AX_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_ALL)) ? true:false)
+	(((dot11Mode == MLME_DOT11_MODE_11N) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11N_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AC) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AC_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AX) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AX_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_ALL)) ? true:false)
 
 #define IS_DOT11_MODE_VHT(dot11Mode) \
-	(((dot11Mode == WNI_CFG_DOT11_MODE_11AC) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AC_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AX) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AX_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_ALL)) ? true:false)
+	(((dot11Mode == MLME_DOT11_MODE_11AC) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AC_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AX) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AX_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_ALL)) ? true:false)
 
 #define IS_DOT11_MODE_HE(dot11Mode) \
-	(((dot11Mode == WNI_CFG_DOT11_MODE_11AX) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AX_ONLY) || \
-	  (dot11Mode ==  WNI_CFG_DOT11_MODE_ALL)) ? true:false)
+	(((dot11Mode == MLME_DOT11_MODE_11AX) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_11AX_ONLY) || \
+	  (dot11Mode ==  MLME_DOT11_MODE_ALL)) ? true:false)
 
 #define IS_DOT11_MODE_11B(dot11Mode)  \
-	((dot11Mode == WNI_CFG_DOT11_MODE_11B) ? true:false)
+	((dot11Mode == MLME_DOT11_MODE_11B) ? true:false)
 
 #define IS_BSS_VHT_CAPABLE(vhtCaps) \
 	((vhtCaps).present && \

core/mac/inc/wni_cfg.h

@@ -50,22 +50,6 @@ enum {
 #define WNI_CFG_PHY_MODE_11G    2
 #define WNI_CFG_PHY_MODE_NONE    3
 
-#define WNI_CFG_DOT11_MODE_STAMIN    0
-#define WNI_CFG_DOT11_MODE_STAMAX    10
-#define WNI_CFG_DOT11_MODE_STADEF    0
-
-#define WNI_CFG_DOT11_MODE_ALL    0
-#define WNI_CFG_DOT11_MODE_11A    1
-#define WNI_CFG_DOT11_MODE_11B    2
-#define WNI_CFG_DOT11_MODE_11G    3
-#define WNI_CFG_DOT11_MODE_11N    4
-#define WNI_CFG_DOT11_MODE_11G_ONLY    5
-#define WNI_CFG_DOT11_MODE_11N_ONLY    6
-#define WNI_CFG_DOT11_MODE_11AC    7
-#define WNI_CFG_DOT11_MODE_11AC_ONLY    8
-#define WNI_CFG_DOT11_MODE_11AX    9
-#define WNI_CFG_DOT11_MODE_11AX_ONLY    10
-
 #define WNI_CFG_CURRENT_CHANNEL_STAMIN    0
 #define WNI_CFG_CURRENT_CHANNEL_STAMAX    173
 

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -1501,12 +1501,12 @@ lim_populate_own_rate_set(struct mac_context *mac_ctx,
 	 * Include 11b rates only when the device configured in
 	 *  auto, 11a/b/g or 11b_only
 	 */
-	if ((self_sta_dot11mode == WNI_CFG_DOT11_MODE_ALL) ||
-	    (self_sta_dot11mode == WNI_CFG_DOT11_MODE_11A) ||
-	    (self_sta_dot11mode == WNI_CFG_DOT11_MODE_11AC) ||
-	    (self_sta_dot11mode == WNI_CFG_DOT11_MODE_11N) ||
-	    (self_sta_dot11mode == WNI_CFG_DOT11_MODE_11G) ||
-	    (self_sta_dot11mode == WNI_CFG_DOT11_MODE_11B)) {
+	if ((self_sta_dot11mode == MLME_DOT11_MODE_ALL) ||
+	    (self_sta_dot11mode == MLME_DOT11_MODE_11A) ||
+	    (self_sta_dot11mode == MLME_DOT11_MODE_11AC) ||
+	    (self_sta_dot11mode == MLME_DOT11_MODE_11N) ||
+	    (self_sta_dot11mode == MLME_DOT11_MODE_11G) ||
+	    (self_sta_dot11mode == MLME_DOT11_MODE_11B)) {
 		val_len = mac_ctx->mlme_cfg->rates.supported_11b.len;
 		wlan_mlme_get_cfg_str((uint8_t *)&temp_rate_set.rate,
 				      &mac_ctx->mlme_cfg->rates.supported_11b,
@@ -1647,10 +1647,10 @@ lim_populate_peer_rate_set(struct mac_context *mac,
 		pe_err("more than SIR_MAC_RATESET_EID_MAX rates");
 		return QDF_STATUS_E_FAILURE;
 	}
-	if ((pe_session->dot11mode == WNI_CFG_DOT11_MODE_11G) ||
-		(pe_session->dot11mode == WNI_CFG_DOT11_MODE_11A) ||
-		(pe_session->dot11mode == WNI_CFG_DOT11_MODE_11AC) ||
-		(pe_session->dot11mode == WNI_CFG_DOT11_MODE_11N)) {
+	if ((pe_session->dot11mode == MLME_DOT11_MODE_11G) ||
+		(pe_session->dot11mode == MLME_DOT11_MODE_11A) ||
+		(pe_session->dot11mode == MLME_DOT11_MODE_11AC) ||
+		(pe_session->dot11mode == MLME_DOT11_MODE_11N)) {
 		if (pe_session->extRateSet.numRates <=
 		    SIR_MAC_RATESET_EID_MAX) {
 			qdf_mem_copy((uint8_t *) tempRateSet2.rate,

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -445,7 +445,7 @@ static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			     uint8_t sub_type)
 {
 	if (LIM_IS_AP_ROLE(session) &&
-	    (session->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) &&
+	    (session->dot11mode == MLME_DOT11_MODE_11G_ONLY) &&
 	    (assoc_req->HTCaps.present)) {
 		pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: "
 				MAC_ADDRESS_STR,
@@ -475,7 +475,7 @@ static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			     uint8_t sub_type)
 {
 	if (LIM_IS_AP_ROLE(session) &&
-	    (session->dot11mode == WNI_CFG_DOT11_MODE_11N_ONLY) &&
+	    (session->dot11mode == MLME_DOT11_MODE_11N_ONLY) &&
 	    (!assoc_req->HTCaps.present)) {
 		pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: "
 				MAC_ADDRESS_STR,
@@ -515,7 +515,7 @@ static bool lim_chk_11ac_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		vht_caps = NULL;
 
 	if (LIM_IS_AP_ROLE(session) &&
-		(session->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY) &&
+		(session->dot11mode == MLME_DOT11_MODE_11AC_ONLY) &&
 		((vht_caps == NULL) || ((vht_caps != NULL) && (!vht_caps->present)))) {
 		lim_send_assoc_rsp_mgmt_frame(mac_ctx,
 			eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
@@ -544,7 +544,7 @@ static bool lim_chk_11ax_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      uint8_t sub_type)
 {
 	if (LIM_IS_AP_ROLE(session) &&
-		(session->dot11mode == WNI_CFG_DOT11_MODE_11AX_ONLY) &&
+		(session->dot11mode == MLME_DOT11_MODE_11AX_ONLY) &&
 		 !assoc_req->he_cap.present) {
 		lim_send_assoc_rsp_mgmt_frame(mac_ctx,
 			eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,

core/mac/src/pe/lim/lim_prop_exts_utils.c

@@ -142,10 +142,10 @@ static void lim_check_he_ldpc_cap(struct pe_session *session,
 		session->he_capable = false;
 		pe_err("LDPC check failed for HE operation");
 		if (session->vhtCapability) {
-			session->dot11mode = WNI_CFG_DOT11_MODE_11AC;
+			session->dot11mode = MLME_DOT11_MODE_11AC;
 			pe_debug("Update dot11mode to 11ac");
 		} else {
-			session->dot11mode = WNI_CFG_DOT11_MODE_11N;
+			session->dot11mode = MLME_DOT11_MODE_11N;
 			pe_debug("Update dot11mode to 11N");
 		}
 	}

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -203,9 +203,9 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
 	 */
 	if (channel <= SIR_11B_CHANNEL_END &&
 	    !mac_ctx->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
-	    (WNI_CFG_DOT11_MODE_11AC == dot11mode ||
-	     WNI_CFG_DOT11_MODE_11AC_ONLY == dot11mode))
-		dot11mode = WNI_CFG_DOT11_MODE_11N;
+	    (MLME_DOT11_MODE_11AC == dot11mode ||
+	     MLME_DOT11_MODE_11AC_ONLY == dot11mode))
+		dot11mode = MLME_DOT11_MODE_11N;
 	/*
 	 * session context may or may not be present, when probe request needs
 	 * to be sent out. Following cases exist:
@@ -237,7 +237,7 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
 	 * Don't include 11b rate if it is a P2P serach or probe request is
 	 * sent by P2P Client
 	 */
-	if ((WNI_CFG_DOT11_MODE_11B != dot11mode) && (p2pie != NULL) &&
+	if ((MLME_DOT11_MODE_11B != dot11mode) && (p2pie != NULL) &&
 	    ((pesession != NULL) &&
 	      (QDF_P2P_CLIENT_MODE == pesession->pePersona))) {
 		/*
@@ -250,7 +250,7 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
 		populate_dot11f_supp_rates(mac_ctx, channel,
 					   &pr.SuppRates, pesession);
 
-		if (WNI_CFG_DOT11_MODE_11B != dot11mode) {
+		if (MLME_DOT11_MODE_11B != dot11mode) {
 			populate_dot11f_ext_supp_rates1(mac_ctx, channel,
 							&pr.ExtSuppRates);
 		}
@@ -612,7 +612,7 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
 	populate_dot11f_country(mac_ctx, &frm->Country, pe_session);
 	populate_dot11f_edca_param_set(mac_ctx, &frm->EDCAParamSet, pe_session);
 
-	if (pe_session->dot11mode != WNI_CFG_DOT11_MODE_11B)
+	if (pe_session->dot11mode != MLME_DOT11_MODE_11B)
 		populate_dot11f_erp_info(mac_ctx, &frm->ERPInfo, pe_session);
 
 	populate_dot11f_ext_supp_rates(mac_ctx,

core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -2072,12 +2072,12 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 	}
 
 	if (WLAN_REG_IS_24GHZ_CH(csa_params->channel) &&
-	    (session_entry->dot11mode == WNI_CFG_DOT11_MODE_11A))
-		session_entry->dot11mode = WNI_CFG_DOT11_MODE_11G;
+	    (session_entry->dot11mode == MLME_DOT11_MODE_11A))
+		session_entry->dot11mode = MLME_DOT11_MODE_11G;
 	else if (WLAN_REG_IS_5GHZ_CH(csa_params->channel) &&
-		 ((session_entry->dot11mode == WNI_CFG_DOT11_MODE_11G) ||
-		 (session_entry->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY)))
-		session_entry->dot11mode = WNI_CFG_DOT11_MODE_11A;
+		 ((session_entry->dot11mode == MLME_DOT11_MODE_11G) ||
+		 (session_entry->dot11mode == MLME_DOT11_MODE_11G_ONLY)))
+		session_entry->dot11mode = MLME_DOT11_MODE_11A;
 
 	/* Send RSO Stop to FW before triggering the vdev restart for CSA */
 	if (mac_ctx->lim.stop_roaming_callback)

core/mac/src/pe/lim/lim_utils.c

@@ -8365,7 +8365,7 @@ QDF_STATUS lim_get_capability_info(struct mac_context *mac, uint16_t *pcap,
 	/* If STA/AP operating in 11B mode, don't set rest of the
 	 * capability info bits.
 	 */
-	if (pe_session->dot11mode == WNI_CFG_DOT11_MODE_11B)
+	if (pe_session->dot11mode == MLME_DOT11_MODE_11B)
 		return QDF_STATUS_SUCCESS;
 
 	/* Short slot time bit */

core/mac/src/pe/sch/sch_beacon_gen.c

@@ -438,7 +438,7 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
 					 session);
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 
-	if (session->dot11mode != WNI_CFG_DOT11_MODE_11B)
+	if (session->dot11mode != MLME_DOT11_MODE_11B)
 		populate_dot11f_erp_info(mac_ctx, &bcn_2->ERPInfo, session);
 
 	if (session->htCapability) {

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1559,12 +1559,12 @@ populate_dot11f_rates_tdls(struct mac_context *p_mac,
 		curr_oper_channel, self_dot11mode);
 
 	if ((curr_oper_channel <= SIR_11B_CHANNEL_END) &&
-	    ((self_dot11mode == WNI_CFG_DOT11_MODE_ALL) ||
-	    (self_dot11mode == WNI_CFG_DOT11_MODE_11A) ||
-	    (self_dot11mode == WNI_CFG_DOT11_MODE_11AC) ||
-	    (self_dot11mode == WNI_CFG_DOT11_MODE_11N) ||
-	    (self_dot11mode == WNI_CFG_DOT11_MODE_11G) ||
-	    (self_dot11mode == WNI_CFG_DOT11_MODE_11B))) {
+	    ((self_dot11mode == MLME_DOT11_MODE_ALL) ||
+	    (self_dot11mode == MLME_DOT11_MODE_11A) ||
+	    (self_dot11mode == MLME_DOT11_MODE_11AC) ||
+	    (self_dot11mode == MLME_DOT11_MODE_11N) ||
+	    (self_dot11mode == MLME_DOT11_MODE_11G) ||
+	    (self_dot11mode == MLME_DOT11_MODE_11B))) {
 		num_rates = p_mac->mlme_cfg->rates.supported_11b.len;
 		wlan_mlme_get_cfg_str((uint8_t *)&temp_rateset.rate,
 				      &p_mac->mlme_cfg->rates.supported_11b,

core/sme/inc/csr_internal.h

@@ -84,7 +84,7 @@
 /* Support for "Fast roaming" (i.e., ESE, LFR, or 802.11r.) */
 #define CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN 15
 
-/* Used to determine what to set to the WNI_CFG_DOT11_MODE */
+/* Used to determine what to set to the MLME_DOT11_MODE */
 enum csr_cfgdot11mode {
 	eCSR_CFG_DOT11_MODE_ABG,
 	eCSR_CFG_DOT11_MODE_11A,

core/sme/src/csr/csr_api_roam.c

@@ -6007,37 +6007,37 @@ static eCsrPhyMode csr_roamdot11mode_to_phymode(uint8_t dot11mode)
 	eCsrPhyMode phymode = eCSR_DOT11_MODE_abg;
 
 	switch (dot11mode) {
-	case WNI_CFG_DOT11_MODE_ALL:
+	case MLME_DOT11_MODE_ALL:
 		phymode = eCSR_DOT11_MODE_abg;
 		break;
-	case WNI_CFG_DOT11_MODE_11A:
+	case MLME_DOT11_MODE_11A:
 		phymode = eCSR_DOT11_MODE_11a;
 		break;
-	case WNI_CFG_DOT11_MODE_11B:
+	case MLME_DOT11_MODE_11B:
 		phymode = eCSR_DOT11_MODE_11b;
 		break;
-	case WNI_CFG_DOT11_MODE_11G:
+	case MLME_DOT11_MODE_11G:
 		phymode = eCSR_DOT11_MODE_11g;
 		break;
-	case WNI_CFG_DOT11_MODE_11N:
+	case MLME_DOT11_MODE_11N:
 		phymode = eCSR_DOT11_MODE_11n;
 		break;
-	case WNI_CFG_DOT11_MODE_11G_ONLY:
+	case MLME_DOT11_MODE_11G_ONLY:
 		phymode = eCSR_DOT11_MODE_11g_ONLY;
 		break;
-	case WNI_CFG_DOT11_MODE_11N_ONLY:
+	case MLME_DOT11_MODE_11N_ONLY:
 		phymode = eCSR_DOT11_MODE_11n_ONLY;
 		break;
-	case WNI_CFG_DOT11_MODE_11AC:
+	case MLME_DOT11_MODE_11AC:
 		phymode = eCSR_DOT11_MODE_11ac;
 		break;
-	case WNI_CFG_DOT11_MODE_11AC_ONLY:
+	case MLME_DOT11_MODE_11AC_ONLY:
 		phymode = eCSR_DOT11_MODE_11ac_ONLY;
 		break;
-	case WNI_CFG_DOT11_MODE_11AX:
+	case MLME_DOT11_MODE_11AX:
 		phymode = eCSR_DOT11_MODE_11ax;
 		break;
-	case WNI_CFG_DOT11_MODE_11AX_ONLY:
+	case MLME_DOT11_MODE_11AX_ONLY:
 		phymode = eCSR_DOT11_MODE_11ax_ONLY;
 		break;
 	default:
@@ -14448,9 +14448,9 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 							    uCfgDot11Mode);
 		if (pBssDescription->channelId <= 14 &&
 		    !mac->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
-		    dot11mode == WNI_CFG_DOT11_MODE_11AC) {
+		    dot11mode == MLME_DOT11_MODE_11AC) {
 			/* Need to disable VHT operation in 2.4 GHz band */
-			dot11mode = WNI_CFG_DOT11_MODE_11N;
+			dot11mode = MLME_DOT11_MODE_11N;
 		}
 
 		if (IS_5G_CH(pBssDescription->channelId))
@@ -14564,10 +14564,10 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 		if (mac->roam.configParam.is_force_1x1 &&
 		    mac->lteCoexAntShare &&
 		    is_vendor_ap_present &&
-		    (dot11mode == WNI_CFG_DOT11_MODE_ALL ||
-		     dot11mode == WNI_CFG_DOT11_MODE_11AC ||
-		     dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY))
-			dot11mode = WNI_CFG_DOT11_MODE_11N;
+		    (dot11mode == MLME_DOT11_MODE_ALL ||
+		     dot11mode == MLME_DOT11_MODE_11AC ||
+		     dot11mode == MLME_DOT11_MODE_11AC_ONLY))
+			dot11mode = MLME_DOT11_MODE_11N;
 
 		csr_join_req->supported_nss_1x1 = pSession->supported_nss_1x1;
 		csr_join_req->vdev_nss = pSession->vdev_nss;
@@ -19668,9 +19668,9 @@ QDF_STATUS csr_roam_channel_change_req(struct mac_context *mac,
 					param.uCfgDot11Mode);
 	if (IS_24G_CH(msg->targetChannel) &&
 	    !mac->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
-	    (msg->dot11mode == WNI_CFG_DOT11_MODE_11AC ||
-	    msg->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY))
-		msg->dot11mode = WNI_CFG_DOT11_MODE_11N;
+	    (msg->dot11mode == MLME_DOT11_MODE_11AC ||
+	    msg->dot11mode == MLME_DOT11_MODE_11AC_ONLY))
+		msg->dot11mode = MLME_DOT11_MODE_11N;
 	msg->nw_type = param.sirNwType;
 	msg->center_freq_seg_0 = ch_params->center_freq_seg0;
 	msg->center_freq_seg_1 = ch_params->center_freq_seg1;

core/sme/src/csr/csr_roam_preauth.c

@@ -496,9 +496,9 @@ static uint32_t csr_get_dot11_mode(struct mac_context *mac_ctx,
 
 	if (bss_desc->channelId <= 14 &&
 		!mac_ctx->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
-		WNI_CFG_DOT11_MODE_11AC == dot11mode) {
+		MLME_DOT11_MODE_11AC == dot11mode) {
 		/* Need to disable VHT operation in 2.4 GHz band */
-		dot11mode = WNI_CFG_DOT11_MODE_11N;
+		dot11mode = MLME_DOT11_MODE_11N;
 	}
 	qdf_mem_free(ies_local);
 	return dot11mode;

core/sme/src/csr/csr_util.c

@@ -1555,64 +1555,64 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(struct mac_context *mac,
 	case eCSR_CFG_DOT11_MODE_AUTO:
 		sme_debug("eCSR_CFG_DOT11_MODE_AUTO");
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AX))
-			ret = WNI_CFG_DOT11_MODE_11AX;
+			ret = MLME_DOT11_MODE_11AX;
 		else if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
-			ret = WNI_CFG_DOT11_MODE_11AC;
+			ret = MLME_DOT11_MODE_11AC;
 		else
-			ret = WNI_CFG_DOT11_MODE_11N;
+			ret = MLME_DOT11_MODE_11N;
 		break;
 	case eCSR_CFG_DOT11_MODE_11A:
-		ret = WNI_CFG_DOT11_MODE_11A;
+		ret = MLME_DOT11_MODE_11A;
 		break;
 	case eCSR_CFG_DOT11_MODE_11B:
-		ret = WNI_CFG_DOT11_MODE_11B;
+		ret = MLME_DOT11_MODE_11B;
 		break;
 	case eCSR_CFG_DOT11_MODE_11G:
-		ret = WNI_CFG_DOT11_MODE_11G;
+		ret = MLME_DOT11_MODE_11G;
 		break;
 	case eCSR_CFG_DOT11_MODE_11N:
-		ret = WNI_CFG_DOT11_MODE_11N;
+		ret = MLME_DOT11_MODE_11N;
 		break;
 	case eCSR_CFG_DOT11_MODE_11G_ONLY:
-		ret = WNI_CFG_DOT11_MODE_11G_ONLY;
+		ret = MLME_DOT11_MODE_11G_ONLY;
 		break;
 	case eCSR_CFG_DOT11_MODE_11N_ONLY:
-		ret = WNI_CFG_DOT11_MODE_11N_ONLY;
+		ret = MLME_DOT11_MODE_11N_ONLY;
 		break;
 	case eCSR_CFG_DOT11_MODE_11AC_ONLY:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
-			ret = WNI_CFG_DOT11_MODE_11AC_ONLY;
+			ret = MLME_DOT11_MODE_11AC_ONLY;
 		else
-			ret = WNI_CFG_DOT11_MODE_11N;
+			ret = MLME_DOT11_MODE_11N;
 		break;
 	case eCSR_CFG_DOT11_MODE_11AC:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
-			ret = WNI_CFG_DOT11_MODE_11AC;
+			ret = MLME_DOT11_MODE_11AC;
 		else
-			ret = WNI_CFG_DOT11_MODE_11N;
+			ret = MLME_DOT11_MODE_11N;
 		break;
 	case eCSR_CFG_DOT11_MODE_11AX_ONLY:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AX))
-			ret = WNI_CFG_DOT11_MODE_11AX_ONLY;
+			ret = MLME_DOT11_MODE_11AX_ONLY;
 		else if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
-			ret = WNI_CFG_DOT11_MODE_11AC;
+			ret = MLME_DOT11_MODE_11AC;
 		else
-			ret = WNI_CFG_DOT11_MODE_11N;
+			ret = MLME_DOT11_MODE_11N;
 		break;
 	case eCSR_CFG_DOT11_MODE_11AX:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AX))
-			ret = WNI_CFG_DOT11_MODE_11AX;
+			ret = MLME_DOT11_MODE_11AX;
 		else if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
-			ret = WNI_CFG_DOT11_MODE_11AC;
+			ret = MLME_DOT11_MODE_11AC;
 		else
-			ret = WNI_CFG_DOT11_MODE_11N;
+			ret = MLME_DOT11_MODE_11N;
 		break;
 	default:
 		sme_warn("doesn't expect %d as csrDo11Mode", csrDot11Mode);
 		if (BAND_2G == mac->mlme_cfg->gen.band)
-			ret = WNI_CFG_DOT11_MODE_11G;
+			ret = MLME_DOT11_MODE_11G;
 		else
-			ret = WNI_CFG_DOT11_MODE_11A;
+			ret = MLME_DOT11_MODE_11A;
 		break;
 	}
 
@@ -5815,8 +5815,8 @@ tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype)
 }
 
 /* This function use the parameters to decide the CFG value. */
-/* CSR never sets WNI_CFG_DOT11_MODE_ALL to the CFG */
-/* So PE should not see WNI_CFG_DOT11_MODE_ALL when it gets the CFG value */
+/* CSR never sets MLME_DOT11_MODE_ALL to the CFG */
+/* So PE should not see MLME_DOT11_MODE_ALL when it gets the CFG value */
 enum csr_cfgdot11mode
 csr_get_cfg_dot11_mode_from_csr_phy_mode(struct csr_roam_profile *pProfile,
 					 eCsrPhyMode phyMode,

core/wma/src/wma_features.c

@@ -687,44 +687,44 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint8_t chan, enum phy_ch_width chan_width,
 	if (WLAN_REG_IS_24GHZ_CH(chan)) {
 		if (((CH_WIDTH_5MHZ == chan_width) ||
 		     (CH_WIDTH_10MHZ == chan_width)) &&
-		    ((WNI_CFG_DOT11_MODE_11B == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11G == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11N == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_ALL == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11AC == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11AX == dot11_mode)))
+		    ((MLME_DOT11_MODE_11B == dot11_mode) ||
+		     (MLME_DOT11_MODE_11G == dot11_mode) ||
+		     (MLME_DOT11_MODE_11N == dot11_mode) ||
+		     (MLME_DOT11_MODE_ALL == dot11_mode) ||
+		     (MLME_DOT11_MODE_11AC == dot11_mode) ||
+		     (MLME_DOT11_MODE_11AX == dot11_mode)))
 			phymode = MODE_11G;
 		else {
 			switch (dot11_mode) {
-			case WNI_CFG_DOT11_MODE_11B:
+			case MLME_DOT11_MODE_11B:
 				if ((bw_val == 20) || (bw_val == 40))
 					phymode = MODE_11B;
 				break;
-			case WNI_CFG_DOT11_MODE_11G:
+			case MLME_DOT11_MODE_11G:
 				if ((bw_val == 20) || (bw_val == 40))
 					phymode = MODE_11G;
 				break;
-			case WNI_CFG_DOT11_MODE_11G_ONLY:
+			case MLME_DOT11_MODE_11G_ONLY:
 				if ((bw_val == 20) || (bw_val == 40))
 					phymode = MODE_11GONLY;
 				break;
-			case WNI_CFG_DOT11_MODE_11N:
-			case WNI_CFG_DOT11_MODE_11N_ONLY:
+			case MLME_DOT11_MODE_11N:
+			case MLME_DOT11_MODE_11N_ONLY:
 				if (bw_val == 20)
 					phymode = MODE_11NG_HT20;
 				else if (bw_val == 40)
 					phymode = MODE_11NG_HT40;
 				break;
-			case WNI_CFG_DOT11_MODE_ALL:
-			case WNI_CFG_DOT11_MODE_11AC:
-			case WNI_CFG_DOT11_MODE_11AC_ONLY:
+			case MLME_DOT11_MODE_ALL:
+			case MLME_DOT11_MODE_11AC:
+			case MLME_DOT11_MODE_11AC_ONLY:
 				if (bw_val == 20)
 					phymode = MODE_11AC_VHT20_2G;
 				else if (bw_val == 40)
 					phymode = MODE_11AC_VHT40_2G;
 				break;
-			case WNI_CFG_DOT11_MODE_11AX:
-			case WNI_CFG_DOT11_MODE_11AX_ONLY:
+			case MLME_DOT11_MODE_11AX:
+			case MLME_DOT11_MODE_11AX_ONLY:
 				if (20 == bw_val)
 					phymode = MODE_11AX_HE20_2G;
 				else if (40 == bw_val)
@@ -739,28 +739,28 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint8_t chan, enum phy_ch_width chan_width,
 	else {
 		if (((CH_WIDTH_5MHZ == chan_width) ||
 		     (CH_WIDTH_10MHZ == chan_width)) &&
-		    ((WNI_CFG_DOT11_MODE_11A == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11N == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_ALL == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11AC == dot11_mode) ||
-		     (WNI_CFG_DOT11_MODE_11AX == dot11_mode)))
+		    ((MLME_DOT11_MODE_11A == dot11_mode) ||
+		     (MLME_DOT11_MODE_11N == dot11_mode) ||
+		     (MLME_DOT11_MODE_ALL == dot11_mode) ||
+		     (MLME_DOT11_MODE_11AC == dot11_mode) ||
+		     (MLME_DOT11_MODE_11AX == dot11_mode)))
 			phymode = MODE_11A;
 		else {
 			switch (dot11_mode) {
-			case WNI_CFG_DOT11_MODE_11A:
+			case MLME_DOT11_MODE_11A:
 				if (0 < bw_val)
 					phymode = MODE_11A;
 				break;
-			case WNI_CFG_DOT11_MODE_11N:
-			case WNI_CFG_DOT11_MODE_11N_ONLY:
+			case MLME_DOT11_MODE_11N:
+			case MLME_DOT11_MODE_11N_ONLY:
 				if (bw_val == 20)
 					phymode = MODE_11NA_HT20;
 				else if (40 <= bw_val)
 					phymode = MODE_11NA_HT40;
 				break;
-			case WNI_CFG_DOT11_MODE_ALL:
-			case WNI_CFG_DOT11_MODE_11AC:
-			case WNI_CFG_DOT11_MODE_11AC_ONLY:
+			case MLME_DOT11_MODE_ALL:
+			case MLME_DOT11_MODE_11AC:
+			case MLME_DOT11_MODE_11AC_ONLY:
 				if (bw_val == 20)
 					phymode = MODE_11AC_VHT20;
 				else if (bw_val == 40)
@@ -772,8 +772,8 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint8_t chan, enum phy_ch_width chan_width,
 				else if (chan_width == CH_WIDTH_80P80MHZ)
 					phymode = MODE_11AC_VHT80_80;
 				break;
-			case WNI_CFG_DOT11_MODE_11AX:
-			case WNI_CFG_DOT11_MODE_11AX_ONLY:
+			case MLME_DOT11_MODE_11AX:
+			case MLME_DOT11_MODE_11AX_ONLY:
 				if (20 == bw_val)
 					phymode = MODE_11AX_HE20;
 				else if (40 == bw_val)

core/wma/src/wma_ocb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -53,9 +53,9 @@ static QDF_STATUS wma_start_ocb_vdev(struct ocb_config *config)
 	req.chan = cds_freq_to_chan(config->channels[0].chan_freq);
 	req.vdev_id = msg->vdev_id;
 	if (cds_chan_to_band(req.chan) == CDS_BAND_2GHZ)
-		req.dot11_mode = WNI_CFG_DOT11_MODE_11G;
+		req.dot11_mode = MLME_DOT11_MODE_11G;
 	else
-		req.dot11_mode = WNI_CFG_DOT11_MODE_11A;
+		req.dot11_mode = MLME_DOT11_MODE_11A;
 
 	req.preferred_rx_streams = 2;
 	req.preferred_tx_streams = 2;