qcacld-3.0: use enum wlan_status_code for wlan status code

Use the new enum wlan_status_code for wlan status code and
remove enum mac_status_code.

Change-Id: If42cfdcf99d34ffa77be53382d02288ab8637c10
CRs-Fixed: 2789000

core/mac/inc/sir_api.h

@@ -1223,7 +1223,7 @@ struct assoc_cnf {
 	struct qdf_mac_addr bssid;      /* Self BSSID */
 	struct qdf_mac_addr peer_macaddr;
 	uint16_t aid;
-	enum mac_status_code mac_status_code;
+	enum wlan_status_code mac_status_code;
 	uint8_t *owe_ie;
 	uint32_t owe_ie_len;
 	bool need_assoc_rsp_tx_cb;
@@ -1569,7 +1569,7 @@ typedef struct sSirAddtsReqInfo {
 
 typedef struct sSirAddtsRspInfo {
 	uint8_t dialogToken;
-	enum mac_status_code status;
+	enum wlan_status_code status;
 	tSirMacTsDelayIE delay;
 
 	struct mac_tspec_ie tspec;

core/mac/inc/sir_mac_prot_def.h

@@ -341,98 +341,6 @@
 #define SIR_MAX_BEACON_SIZE    512
 #define SIR_MAX_PROBE_RESP_SIZE 512
 
-/* Status Code (present in Management response frames) enum */
-/* (IEEE Std 802.11-2016, 9.4.1.9, Table 9-46) */
-
-enum mac_status_code {
-	eSIR_MAC_SUCCESS_STATUS = 0,    /* Reserved */
-	eSIR_MAC_UNSPEC_FAILURE_STATUS = 1,     /* Unspecified reason */
-	/* 802.11 reserved                              2-9 */
-	/*
-	   WMM status codes(standard 1.1 table 9)
-	   Table 9 ADDTS Response Status Codes
-	   Value Operation
-	   0 Admission accepted
-	   1 Invalid parameters
-	   2 Reserved
-	   3 Refused
-	   4-255 Reserved
-	 */
-	eSIR_MAC_WME_INVALID_PARAMS_STATUS = 1, /* ?? */
-	eSIR_MAC_WME_REFUSED_STATUS = 3,        /* ?? */
-	eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS = 10,        /* Cannot support all requested capabilities in the Capability Information field */
-	eSIR_MAC_INABLITY_TO_CONFIRM_ASSOC_STATUS = 11, /* Reassociation denied due to inability to confirm that association exists */
-	eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS = 12,     /* Association denied due to reason outside the scope of this standard */
-	eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS = 13,   /* Responding station does not support the specified authentication algorithm */
-	eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS = 14,     /* Received an Authentication frame with authentication transaction sequence number */
-	/* out of expected sequence */
-	eSIR_MAC_CHALLENGE_FAILURE_STATUS = 15, /* Authentication rejected because of challenge failure */
-	eSIR_MAC_AUTH_RSP_TIMEOUT_STATUS = 16,  /* Authentication rejected due to timeout waiting for next frame in sequence */
-	eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS = 17,     /* Association denied because AP is unable to handle additional associated stations */
-	eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS = 18, /* Association denied due to requesting station not supporting all of the data rates in the */
-	/* BSSBasicRateSet parameter */
-	eSIR_MAC_SHORT_PREAMBLE_NOT_SUPPORTED_STATUS = 19,      /* Association denied due to requesting station not supporting the short preamble */
-	/* option */
-	eSIR_MAC_PBCC_NOT_SUPPORTED_STATUS = 20,        /* Association denied due to requesting station not supporting the PBCC modulation */
-	/* option */
-	eSIR_MAC_CHANNEL_AGILITY_NOT_SUPPORTED_STATUS = 21,     /* Association denied due to requesting station not supporting the Channel Agility */
-	/* option */
-	eSIR_MAC_SPECTRUM_MGMT_REQD_STATUS = 22,        /* Association request rejected because Spectrum Management capability is required */
-	eSIR_MAC_PWR_CAPABILITY_BAD_STATUS = 23,        /* Association request rejected because the information in the Power Capability */
-	/* element is unacceptable */
-	eSIR_MAC_SPRTD_CHANNELS_BAD_STATUS = 24,        /* Association request rejected because the information in the Supported Channels */
-	/* element is unacceptable */
-	eSIR_MAC_SHORT_SLOT_NOT_SUPPORTED_STATUS = 25,   /* Association denied due to requesting station not supporting the Short Slot Time */
-	/* option */
-	eSIR_MAC_DSSS_OFDM_NOT_SUPPORTED_STATUS = 26,   /* Association denied due to requesting station not supporting the DSSS-OFDM option */
-	/* reserved                                     27-29 */
-	eSIR_MAC_TRY_AGAIN_LATER = 30,  /* Association request rejected temporarily, try again later */
-#ifdef WLAN_FEATURE_11W
-	eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION_STATUS = 31,    /* Robust management frames policy violation */
-#endif
-	eSIR_MAC_QOS_UNSPECIFIED_FAILURE_STATUS = 32,   /* Unspecified, QoS-related failure */
-	eSIR_MAC_QAP_NO_BANDWIDTH_STATUS = 33,  /* Association denied because QoS AP has insufficient bandwidth to handle another */
-	/* QoS STA */
-	/*
-	 * Association denied due to excessive frame loss rates
-	 * and/or poor conditions/RSSI on cur channel
-	 */
-	eSIR_MAC_XS_FRAME_LOSS_POOR_CHANNEL_RSSI_STATUS = 34,
-	/* rent operating channel */
-	eSIR_MAC_STA_QOS_NOT_SUPPORTED_STATUS = 35,     /* Association (with QoS BSS) denied because the requesting STA does not support the */
-	/* QoS facility */
-	eSIR_MAC_STA_BLK_ACK_NOT_SUPPORTED_STATUS = 36, /* Reserved */
-	eSIR_MAC_REQ_DECLINED_STATUS = 37,      /* The request has been declined */
-	eSIR_MAC_INVALID_PARAM_STATUS = 38,     /* The request has not been successful as one or more parameters have invalid values */
-	eSIR_MAC_TS_NOT_HONOURED_STATUS = 39,   /* The TS has not been created because the request cannot be honored; however, a suggested */
-	/* TSPEC is provided so that the initiating STA may attempt to set another TS */
-	/* with the suggested changes to the TSPEC */
-	eSIR_MAC_INVALID_IE_STATUS = 40,       /* Invalid information element, i.e., an information element defined in this standard for */
-	/* which the content does not meet the specifications in Clause 7 */
-	eSIR_MAC_INVALID_GROUP_CIPHER_STATUS = 41,      /* Invalid group cipher */
-	eSIR_MAC_INVALID_PAIRWISE_CIPHER_STATUS = 42,   /* Invalid pairwise cipher */
-	eSIR_MAC_INVALID_AKMP_STATUS = 43,      /* Invalid AKMP */
-	eSIR_MAC_UNSUPPORTED_RSN_IE_VERSION_STATUS = 44,        /* Unsupported RSN information element version */
-	eSIR_MAC_INVALID_RSN_IE_CAPABILITIES_STATUS = 45,       /* Invalid RSN information element capabilities */
-	eSIR_MAC_CIPHER_SUITE_REJECTED_STATUS = 46,     /* Cipher suite rejected because of security policy */
-	eSIR_MAC_TS_NOT_CREATED_STATUS = 47,    /* The TS has not been created; however, the HC may be capable of creating a TS, in */
-	/* response to a request, after the time indicated in the TS Delay element */
-	eSIR_MAC_DL_NOT_ALLOWED_STATUS = 48,    /* Direct link is not allowed in the BSS by policy */
-	eSIR_MAC_DEST_STA_NOT_KNOWN_STATUS = 49,        /* The Destination STA is not present within this BSS */
-	eSIR_MAC_DEST_STA_NOT_QSTA_STATUS = 50, /* The Destination STA is not a QoS STA */
-	eSIR_MAC_INVALID_LISTEN_INTERVAL_STATUS = 51,   /* Association denied because the ListenInterval is too large */
-
-	eSIR_MAC_INVALID_FT_ACTION_FRAME_COUNT = 52,
-	eSIR_MAC_INVALID_PMKID = 53,
-#ifdef FEATURE_WLAN_ESE
-	eSIR_MAC_ESE_UNSPECIFIED_QOS_FAILURE_STATUS = 200,      /* ESE-Unspecified, QoS related failure in (Re)Assoc response frames */
-	eSIR_MAC_ESE_TSPEC_REQ_REFUSED_STATUS = 201,    /* ESE-TSPEC request refused due to AP's policy configuration in AddTs Rsp, (Re)Assoc Rsp. */
-	eSIR_MAC_ESE_ASSOC_DENIED_INSUFF_BW_STATUS = 202,       /* ESE-Assoc denied due to insufficient bandwidth to handle new TS in (Re)Assoc Rsp. */
-	eSIR_MAC_ESE_INVALID_PARAMETERS_STATUS = 203,   /* ESE-Invalid parameters. (Re)Assoc request had one or more TSPEC parameters with */
-	/* invalid values. */
-#endif
-};
-
 /* / Frame control field format (2 bytes) */
 typedef struct sSirMacFrameCtl {
 

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

@@ -688,7 +688,7 @@ void
 lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
 			uint8_t sub_type, uint8_t add_pre_auth_context,
 			tAniAuthType auth_type, uint16_t sta_id,
-			uint8_t delete_sta, enum mac_status_code result_code,
+			uint8_t delete_sta, enum wlan_status_code result_code,
 			struct pe_session *session_entry)
 {
 	tpDphHashNode sta_ds;
@@ -719,7 +719,7 @@ lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
 	if (delete_sta == false) {
 		lim_send_assoc_rsp_mgmt_frame(
 				mac_ctx,
-				eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS,
+				STATUS_AP_UNABLE_TO_HANDLE_NEW_STA,
 				1, peer_addr, sub_type, 0, session_entry,
 				false);
 		pe_warn("received Re/Assoc req when max associated STAs reached from");
@@ -2869,7 +2869,7 @@ void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId)
 					       true,
 					       sta->mlmStaContext.authType,
 					       sta->assocId, true,
-					       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+					       STATUS_UNSPECIFIED_FAILURE,
 					       pe_session);
 		}
 		break;
@@ -3104,7 +3104,7 @@ lim_check_and_announce_join_success(struct mac_context *mac_ctx,
 				QDF_MAC_ADDR_REF(session_entry->bssId),
 				session_entry->peSessionId);
 		mlm_join_cnf.resultCode = eSIR_SME_ASSOC_REFUSED;
-		mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_join_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		session_entry->limMlmState = eLIM_MLM_IDLE_STATE;
 		mlm_join_cnf.sessionId = session_entry->peSessionId;
 		if (session_entry->pLimMlmJoinReq) {
@@ -3140,7 +3140,7 @@ lim_check_and_announce_join_success(struct mac_context *mac_ctx,
 	 * Join confirm to SME.
 	 */
 	mlm_join_cnf.resultCode = eSIR_SME_SUCCESS;
-	mlm_join_cnf.protStatusCode = eSIR_MAC_SUCCESS_STATUS;
+	mlm_join_cnf.protStatusCode = STATUS_SUCCESS;
 	/* Update PE sessionId */
 	mlm_join_cnf.sessionId = session_entry->peSessionId;
 	lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF,

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

@@ -48,7 +48,7 @@ QDF_STATUS lim_cleanup_rx_path(struct mac_context *, tpDphHashNode,
 			       struct pe_session *);
 void lim_reject_association(struct mac_context *, tSirMacAddr, uint8_t,
 			    uint8_t, tAniAuthType, uint16_t, uint8_t,
-			    enum mac_status_code, struct pe_session *);
+			    enum wlan_status_code, struct pe_session *);
 
 QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac,
 				      struct supported_rates *pRates,

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

@@ -787,10 +787,10 @@ lim_ft_send_aggr_qos_rsp(struct mac_context *mac, uint8_t rspReqd,
 		if ((1 << i) & aggrQosRsp->tspecIdx) {
 			if (QDF_IS_STATUS_SUCCESS(aggrQosRsp->status[i]))
 				rsp->aggrInfo.aggrRsp[i].status =
-					eSIR_MAC_SUCCESS_STATUS;
+					STATUS_SUCCESS;
 			else
 				rsp->aggrInfo.aggrRsp[i].status =
-					eSIR_MAC_UNSPEC_FAILURE_STATUS;
+					STATUS_UNSPECIFIED_FAILURE;
 			rsp->aggrInfo.aggrRsp[i].tspec = aggrQosRsp->tspec[i];
 		}
 	}

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

@@ -545,7 +545,7 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
 		SIR_MAC_ACCESSPOLICY_HCCA) ||
 		(addts.tspec.tsinfo.traffic.accessPolicy ==
 			SIR_MAC_ACCESSPOLICY_BOTH)) &&
-		(addts.status == eSIR_MAC_SUCCESS_STATUS)) {
+		(addts.status == STATUS_SUCCESS)) {
 		/* add the classifier - this should always succeed */
 		if (addts.numTclas > 1) {
 			/* currently no support for multiple tclas elements */
@@ -565,7 +565,7 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
 	/* deactivate the response timer */
 	lim_deactivate_and_change_timer(mac_ctx, eLIM_ADDTS_RSP_TIMER);
 
-	if (addts.status != eSIR_MAC_SUCCESS_STATUS) {
+	if (addts.status != STATUS_SUCCESS) {
 		pe_debug("Recv AddTsRsp: tsid: %d UP: %d status: %d",
 			addts.tspec.tsinfo.traffic.tsid,
 			addts.tspec.tsinfo.traffic.userPrio, addts.status);

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

@@ -224,7 +224,7 @@ static bool lim_chk_sa_da(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		return true;
 
 	pe_err("Assoc Req rejected: wlan.sa = wlan.da");
-	lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
+	lim_send_assoc_rsp_mgmt_frame(mac_ctx, STATUS_UNSPECIFIED_FAILURE,
 				      1, hdr->sa, sub_type, 0, session, false);
 	return false;
 }
@@ -265,7 +265,7 @@ static bool lim_chk_assoc_req_parse_error(struct mac_context *mac_ctx,
 
 	pe_warn("Assoc Req rejected: frame parsing error. source addr:"
 			QDF_MAC_ADDR_FMT, QDF_MAC_ADDR_REF(hdr->sa));
-	lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
+	lim_send_assoc_rsp_mgmt_frame(mac_ctx, STATUS_UNSPECIFIED_FAILURE,
 				      1, hdr->sa, sub_type, 0, session, false);
 	return false;
 }
@@ -309,7 +309,7 @@ static bool lim_chk_capab(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		 * status code.
 		 */
 		lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
+			mac_ctx, STATUS_CAPS_UNSUPPORTED,
 			1, hdr->sa, sub_type, 0, session, false);
 		return false;
 	}
@@ -347,7 +347,7 @@ static bool lim_chk_ssid(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	 * SSID that does not match with local one. Respond with unspecified
 	 * status code.
 	 */
-	lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
+	lim_send_assoc_rsp_mgmt_frame(mac_ctx, STATUS_UNSPECIFIED_FAILURE,
 				      1, hdr->sa, sub_type, 0, session, false);
 	return false;
 }
@@ -401,7 +401,7 @@ static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	 * 'basic rates not supported' status code.
 	 */
 	lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, 1,
+			mac_ctx, STATUS_ASSOC_DENIED_RATES, 1,
 			hdr->sa, sub_type, 0, session, false);
 	return false;
 }
@@ -429,7 +429,7 @@ static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 				QDF_MAC_ADDR_FMT,
 			QDF_MAC_ADDR_REF(hdr->sa));
 		lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
+			mac_ctx, STATUS_CAPS_UNSUPPORTED,
 			1, hdr->sa, sub_type, 0, session, false);
 		return false;
 	}
@@ -459,7 +459,7 @@ static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 				QDF_MAC_ADDR_FMT,
 			QDF_MAC_ADDR_REF(hdr->sa));
 		lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
+			mac_ctx, STATUS_CAPS_UNSUPPORTED,
 			1, hdr->sa, sub_type, 0, session, false);
 		return false;
 	}
@@ -496,7 +496,7 @@ static bool lim_chk_11ac_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		(session->dot11mode == MLME_DOT11_MODE_11AC_ONLY) &&
 		((!vht_caps) || ((vht_caps) && (!vht_caps->present)))) {
 		lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
+			mac_ctx, STATUS_CAPS_UNSUPPORTED,
 			1, hdr->sa, sub_type, 0, session, false);
 		pe_err("SOFTAP was in 11AC only mode, reject");
 		return false;
@@ -525,7 +525,7 @@ static bool lim_chk_11ax_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		(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,
+			mac_ctx, STATUS_CAPS_UNSUPPORTED,
 			1, hdr->sa, sub_type, 0, session, false);
 		pe_err("SOFTAP was in 11AX only mode, reject");
 		return false;
@@ -564,7 +564,7 @@ static bool lim_check_11ax_basic_mcs(struct mac_context *mac_ctx,
 		if (final_mcs != basic_mcs) {
 			lim_send_assoc_rsp_mgmt_frame(
 				mac_ctx,
-				eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
+				STATUS_CAPS_UNSUPPORTED,
 				1, hdr->sa, sub_type, 0, session, false);
 			pe_err("STA did not support basic MCS required by SAP");
 			return false;
@@ -707,7 +707,7 @@ static bool lim_chk_mcs(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		 * scenario.
 		 */
 		lim_send_assoc_rsp_mgmt_frame(
-			mac_ctx, eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS,
+			mac_ctx, STATUS_ASSOC_DENIED_UNSPEC,
 			1, hdr->sa, sub_type, 0, session, false);
 		return false;
 	}
@@ -745,7 +745,7 @@ static bool lim_chk_is_11b_sta_supported(struct mac_context *mac_ctx,
 			 */
 			lim_send_assoc_rsp_mgmt_frame(
 				mac_ctx,
-				eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS,
+				STATUS_ASSOC_DENIED_RATES,
 				1, hdr->sa, sub_type, 0, session, false);
 
 			pe_warn("Rejecting Re/Assoc req from 11b STA:");
@@ -802,7 +802,7 @@ static void lim_print_ht_cap(struct mac_context *mac_ctx, struct pe_session *ses
 	}
 }
 
-static enum mac_status_code
+static enum wlan_status_code
 lim_check_crypto_param(tpSirAssocReq assoc_req,
 		       struct wlan_crypto_params *peer_crypto_params)
 {
@@ -813,14 +813,14 @@ lim_check_crypto_param(tpSirAssocReq assoc_req,
 		    (peer_crypto_params->ucastcipherset &
 			(1 << WLAN_CRYPTO_CIPHER_WEP))) {
 			pe_info("TKIP/WEP cipher with HT supported client, reject assoc");
-			return eSIR_MAC_INVALID_IE_STATUS;
+			return STATUS_INVALID_IE;
 		}
 	}
-	return eSIR_MAC_SUCCESS_STATUS;
+	return STATUS_SUCCESS;
 }
 
 static
-enum mac_status_code lim_check_rsn_ie(struct pe_session *session,
+enum wlan_status_code lim_check_rsn_ie(struct pe_session *session,
 				      struct mac_context *mac_ctx,
 				      tpSirAssocReq assoc_req,
 				      bool *pmf_connection)
@@ -843,7 +843,7 @@ enum mac_status_code lim_check_rsn_ie(struct pe_session *session,
 							WLAN_LEGACY_MAC_ID);
 		if (!vdev) {
 			pe_err("vdev is NULL");
-			return eSIR_MAC_UNSPEC_FAILURE_STATUS;
+			return STATUS_UNSPECIFIED_FAILURE;
 		}
 		if ((peer_crypto_params.rsn_caps &
 		    WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) &&
@@ -854,13 +854,13 @@ enum mac_status_code lim_check_rsn_ie(struct pe_session *session,
 		return lim_check_crypto_param(assoc_req, &peer_crypto_params);
 
 	} else {
-		return eSIR_MAC_INVALID_IE_STATUS;
+		return STATUS_INVALID_IE;
 	}
 
-	return eSIR_MAC_SUCCESS_STATUS;
+	return STATUS_SUCCESS;
 }
 
-static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
+static enum wlan_status_code lim_check_wpa_ie(struct pe_session *session,
 					     struct mac_context *mac_ctx,
 					     tpSirAssocReq assoc_req,
 					     tDot11fIEWPA *wpa)
@@ -874,7 +874,7 @@ static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
 					   nbuffer, &written);
 	if (DOT11F_FAILED(dot11f_status)) {
 		pe_err("Failed to re-pack the RSN IE (0x%0x8)", dot11f_status);
-		return eSIR_MAC_INVALID_IE_STATUS;
+		return STATUS_INVALID_IE;
 	}
 
 	wpa_ie.length = (uint8_t) written;
@@ -885,7 +885,7 @@ static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
 		return lim_check_crypto_param(assoc_req, &peer_crypto_params);
 	}
 
-	return eSIR_MAC_INVALID_IE_STATUS;
+	return STATUS_INVALID_IE;
 }
 
 /**
@@ -898,28 +898,28 @@ static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
   * capable. Reject with eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION
   * if SAE STA is pmf disable.
   *
-  * Return: mac_status_code
+  * Return: wlan_status_code
   */
 #if defined(WLAN_FEATURE_SAE) && defined(WLAN_FEATURE_11W)
-static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session,
+static enum wlan_status_code lim_check_sae_pmf_cap(struct pe_session *session,
 						  tDot11fIERSN *rsn,
 						  enum ani_akm_type akm_type)
 {
-	enum mac_status_code status = eSIR_MAC_SUCCESS_STATUS;
+	enum wlan_status_code status = STATUS_SUCCESS;
 
 	if (session->pLimStartBssReq->pmfCapable &&
 	    (rsn->RSN_Cap[0] & WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) == 0 &&
 	    akm_type == ANI_AKM_TYPE_SAE)
-		status = eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION_STATUS;
+		status = STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION;
 
 	return status;
 }
 #else
-static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session,
+static enum wlan_status_code lim_check_sae_pmf_cap(struct pe_session *session,
 						  tDot11fIERSN *rsn,
 						  enum ani_akm_type akm_type)
 {
-	return eSIR_MAC_SUCCESS_STATUS;
+	return STATUS_SUCCESS;
 }
 #endif
 
@@ -947,7 +947,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 	uint32_t ret;
 	tDot11fIEWPA dot11f_ie_wpa = {0};
 	tDot11fIERSN dot11f_ie_rsn = {0};
-	enum mac_status_code status = eSIR_MAC_SUCCESS_STATUS;
+	enum wlan_status_code status = STATUS_SUCCESS;
 
 	/*
 	 * Clear the buffers so that frame parser knows that there isn't a
@@ -968,7 +968,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 			 * length is zero
 			 */
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_INVALID_IE_STATUS, 1,
+				mac_ctx, STATUS_INVALID_IE, 1,
 				hdr->sa, sub_type, 0, session, false);
 			return false;
 		}
@@ -981,7 +981,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		if (!DOT11F_SUCCEEDED(ret)) {
 			pe_err("Invalid RSN IE");
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_INVALID_IE_STATUS, 1,
+				mac_ctx, STATUS_INVALID_IE, 1,
 				hdr->sa, sub_type, 0, session, false);
 			return false;
 		}
@@ -991,7 +991,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 			/* check the groupwise and pairwise cipher suites */
 			status = lim_check_rsn_ie(session, mac_ctx, assoc_req,
 						  pmf_connection);
-			if (eSIR_MAC_SUCCESS_STATUS != status) {
+			if (status != STATUS_SUCCESS) {
 				pe_warn("Re/Assoc rejected from: "
 					QDF_MAC_ADDR_FMT,
 					QDF_MAC_ADDR_REF(hdr->sa));
@@ -1010,7 +1010,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 			 */
 			lim_send_assoc_rsp_mgmt_frame(
 				mac_ctx,
-				eSIR_MAC_UNSUPPORTED_RSN_IE_VERSION_STATUS,
+				STATUS_UNSUPPORTED_RSN_IE_VERSION,
 				1, hdr->sa, sub_type, 0, session, false);
 			return false;
 		}
@@ -1019,7 +1019,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 
 		status = lim_check_sae_pmf_cap(session, &dot11f_ie_rsn,
 					       *akm_type);
-		if (eSIR_MAC_SUCCESS_STATUS != status) {
+		if (status != STATUS_SUCCESS) {
 			/* Reject pmf disable SAE STA */
 			pe_warn("Re/Assoc rejected from: " QDF_MAC_ADDR_FMT,
 				QDF_MAC_ADDR_REF(hdr->sa));
@@ -1037,7 +1037,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 
 			/* rcvd Assoc req frame with invalid WPA IE length */
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_INVALID_IE_STATUS, 1,
+				mac_ctx, STATUS_INVALID_IE, 1,
 				hdr->sa, sub_type, 0, session, false);
 			return false;
 		}
@@ -1049,7 +1049,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		if (!DOT11F_SUCCEEDED(ret)) {
 			pe_err("Invalid WPA IE");
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_INVALID_IE_STATUS, 1,
+				mac_ctx, STATUS_INVALID_IE, 1,
 				hdr->sa, sub_type, 0, session, false);
 			return false;
 		}
@@ -1057,7 +1057,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		/* check the groupwise and pairwise cipher suites*/
 		status = lim_check_wpa_ie(session, mac_ctx, assoc_req,
 					  &dot11f_ie_wpa);
-		if (eSIR_MAC_SUCCESS_STATUS != status) {
+		if (status != STATUS_SUCCESS) {
 			pe_warn("Re/Assoc rejected from: "
 				QDF_MAC_ADDR_FMT,
 				QDF_MAC_ADDR_REF(hdr->sa));
@@ -1156,7 +1156,7 @@ static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx,
 				mac_ctx->lim.maxStation);
 		lim_reject_association(mac_ctx, hdr->sa, sub_type, false,
 			(tAniAuthType) 0, 0, false,
-			eSIR_MAC_UNSPEC_FAILURE_STATUS,
+			STATUS_UNSPECIFIED_FAILURE,
 			session);
 		return false;
 	}
@@ -1277,8 +1277,8 @@ static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 			 */
 			sta_ds->pmfSaQueryRetryCount = 0;
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_TRY_AGAIN_LATER, 1, hdr->sa,
-				sub_type, sta_ds, session, false);
+				mac_ctx, STATUS_ASSOC_REJECTED_TEMPORARILY, 1,
+				hdr->sa, sub_type, sta_ds, session, false);
 			lim_send_sa_query_request_frame(mac_ctx,
 				(uint8_t *) &(sta_ds->pmfSaQueryCurrentTransId),
 				hdr->sa, session);
@@ -1300,7 +1300,7 @@ static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 		 */
 		case DPH_SA_QUERY_IN_PROGRESS:
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_TRY_AGAIN_LATER, 1,
+				mac_ctx, STATUS_ASSOC_REJECTED_TEMPORARILY, 1,
 				hdr->sa, sub_type, 0, session, false);
 			return false;
 
@@ -1687,7 +1687,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 
 		lim_reject_association(mac_ctx, hdr->sa,
 			sub_type, true, auth_type, peer_idx, false,
-			eSIR_MAC_UNSPEC_FAILURE_STATUS,
+			STATUS_UNSPECIFIED_FAILURE,
 			session);
 		pe_err("Delete dph hash entry");
 		if (dph_delete_hash_entry(mac_ctx, hdr->sa, sta_ds->assocId,
@@ -1783,7 +1783,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			pe_err("could not create PMF SA Query timer");
 			lim_reject_association(mac_ctx, hdr->sa, sub_type,
 					       true, auth_type, peer_idx, false,
-					       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+					       STATUS_UNSPECIFIED_FAILURE,
 					       session);
 			return false;
 		}
@@ -1845,7 +1845,7 @@ static bool lim_update_sta_ctx(struct mac_context *mac_ctx, struct pe_session *s
 				sta_ds->mlmStaContext.subType, true,
 				sta_ds->mlmStaContext.authType,
 				sta_ds->assocId, true,
-				eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				STATUS_UNSPECIFIED_FAILURE,
 				session);
 
 			if (session->parsedAssocReq)
@@ -1877,7 +1877,7 @@ static bool lim_update_sta_ctx(struct mac_context *mac_ctx, struct pe_session *s
 					sta_ds->mlmStaContext.subType, true,
 					sta_ds->mlmStaContext.authType,
 					sta_ds->assocId, true,
-					eSIR_MAC_UNSPEC_FAILURE_STATUS,
+					STATUS_UNSPECIFIED_FAILURE,
 					session);
 
 				/* Restoring the state back. */
@@ -1899,7 +1899,7 @@ static bool lim_update_sta_ctx(struct mac_context *mac_ctx, struct pe_session *s
 					sta_ds->mlmStaContext.subType, true,
 					sta_ds->mlmStaContext.authType,
 					sta_ds->assocId, true,
-					eSIR_MAC_WME_REFUSED_STATUS,
+					STATUS_TDLS_WAKEUP_REJECT,
 					session);
 
 				/* Restoring the state back. */
@@ -2070,7 +2070,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
 		pe_err("PeerIdx not avaialble. Reject associaton");
 		lim_reject_association(mac_ctx, hdr->sa, sub_type,
 				       true, auth_type, peer_idx, false,
-				       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				       STATUS_UNSPECIFIED_FAILURE,
 				       session);
 		return false;
 	}
@@ -2090,7 +2090,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
 
 		lim_reject_association(mac_ctx, hdr->sa, sub_type,
 				       true, auth_type, peer_idx, false,
-				       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				       STATUS_UNSPECIFIED_FAILURE,
 			session);
 		return false;
 	}
@@ -2101,7 +2101,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
 			lim_reject_association(mac_ctx, hdr->sa, sub_type,
 					       true, auth_type, peer_idx,
 					       true,
-					       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+					       STATUS_UNSPECIFIED_FAILURE,
 					       session);
 			return false;
 		}
@@ -2288,7 +2288,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 			 * where some STA does expect 4-way handshake.
 			 */
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS,
+				mac_ctx, STATUS_ASSOC_DENIED_UNSPEC,
 				sta_ds->assocId, sta_ds->staAddr,
 				sub_type, sta_ds, session, false);
 			pe_err("Rejecting reassoc req from STA");
@@ -2325,7 +2325,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 		 */
 		lim_send_assoc_rsp_mgmt_frame(
 			mac_ctx,
-			eSIR_MAC_UNSPEC_FAILURE_STATUS,
+			STATUS_UNSPECIFIED_FAILURE,
 			1, hdr->sa,
 			sub_type, 0, session, false);
 		return;
@@ -2368,7 +2368,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 			pe_err("Vendor ie not present and access policy is %x, Rejected association",
 				session->access_policy);
 			lim_send_assoc_rsp_mgmt_frame(
-				mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				mac_ctx, STATUS_UNSPECIFIED_FAILURE,
 				1, hdr->sa, sub_type, 0, session, false);
 			return;
 		}

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

@@ -538,7 +538,7 @@ lim_handle_pmfcomeback_timer(struct pe_session *session_entry,
 
 	if (session_entry->limRmfEnabled &&
 	    session_entry->pmf_retry_timer_info.retried &&
-	    assoc_rsp->status_code == eSIR_MAC_TRY_AGAIN_LATER) {
+	    assoc_rsp->status_code == STATUS_ASSOC_REJECTED_TEMPORARILY) {
 		pe_debug("Already retry in progress");
 		return QDF_STATUS_SUCCESS;
 	}
@@ -548,7 +548,8 @@ lim_handle_pmfcomeback_timer(struct pe_session *session_entry,
 	 * again later with timeout interval and Assoc comeback type
 	 */
 	if (!session_entry->limRmfEnabled || assoc_rsp->status_code !=
-	    eSIR_MAC_TRY_AGAIN_LATER || !assoc_rsp->TimeoutInterval.present ||
+	    STATUS_ASSOC_REJECTED_TEMPORARILY ||
+	    !assoc_rsp->TimeoutInterval.present ||
 	    assoc_rsp->TimeoutInterval.timeoutType !=
 	    SIR_MAC_TI_TYPE_ASSOC_COMEBACK ||
 	    session_entry->pmf_retry_timer_info.retried)
@@ -815,8 +816,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	}
 	lim_copy_u16((uint8_t *) &mac_capab, caps);
 
-	if (eSIR_MAC_XS_FRAME_LOSS_POOR_CHANNEL_RSSI_STATUS ==
-	   assoc_rsp->status_code &&
+	if (assoc_rsp->status_code == STATUS_DENIED_POOR_CHANNEL_CONDITIONS &&
 	    assoc_rsp->rssi_assoc_rej.present) {
 		struct sir_rssi_disallow_lst ap_info = {{0}};
 
@@ -853,7 +853,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	else
 		lim_stop_reassoc_retry_timer(mac_ctx);
 
-	if (assoc_rsp->status_code != eSIR_MAC_SUCCESS_STATUS) {
+	if (assoc_rsp->status_code != STATUS_SUCCESS) {
 		/*
 		 *Re/Association response was received
 		 * either with failure code.
@@ -878,7 +878,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		pe_err("received Re/AssocRsp frame with invalid aid: %X",
 			assoc_rsp->aid);
 		assoc_cnf.resultCode = eSIR_SME_INVALID_ASSOC_RSP_RXED;
-		assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		/* Send advisory Disassociation frame to AP */
 		lim_send_disassoc_mgmt_frame(mac_ctx,
 			REASON_UNSPEC_FAILURE,
@@ -894,7 +894,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 						assoc_rsp, &assoc_cnf)) {
 		pe_err("FILS params doesnot match");
 		assoc_cnf.resultCode = eSIR_SME_INVALID_ASSOC_RSP_RXED;
-		assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		/* Send advisory Disassociation frame to AP */
 		lim_send_disassoc_mgmt_frame(mac_ctx,
 			REASON_UNSPEC_FAILURE,
@@ -950,7 +950,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			assoc_cnf.resultCode =
 				eSIR_SME_INVALID_ASSOC_RSP_RXED;
 			assoc_cnf.protStatusCode =
-				eSIR_MAC_UNSPEC_FAILURE_STATUS;
+				STATUS_UNSPECIFIED_FAILURE;
 
 			/* Send advisory Disassociation frame to AP */
 			lim_send_disassoc_mgmt_frame(mac_ctx,
@@ -1132,7 +1132,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	} else {
 		pe_err("could not update the bss entry");
 		assoc_cnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
-		assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	}
 
 assocReject:

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

@@ -151,7 +151,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 		auth_frame->authTransactionSeqNumber =
 			rx_auth_frm_body->authTransactionSeqNumber + 1;
 		auth_frame->authStatusCode =
-			eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS;
+			STATUS_NOT_SUPPORTED_AUTH_ALG;
 
 		lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -198,7 +198,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
 			auth_frame->authStatusCode =
-				eSIR_MAC_UNSPEC_FAILURE_STATUS;
+				STATUS_UNSPECIFIED_FAILURE;
 
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -223,7 +223,8 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 				rx_auth_frm_body->authAlgoNumber;
 			auth_frame->authTransactionSeqNumber =
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
-			auth_frame->authStatusCode = eSIR_MAC_TRY_AGAIN_LATER;
+			auth_frame->authStatusCode =
+				STATUS_ASSOC_REJECTED_TEMPORARILY;
 			lim_send_auth_mgmt_frame(mac_ctx,
 						 auth_frame,
 						 mac_hdr->sa,
@@ -245,7 +246,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 		auth_frame->authAlgoNumber = rx_auth_frm_body->authAlgoNumber;
 		auth_frame->authTransactionSeqNumber =
 			rx_auth_frm_body->authTransactionSeqNumber + 1;
-		auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS;
+		auth_frame->authStatusCode = STATUS_SUCCESS;
 		auth_frame->type = WLAN_ELEMID_CHALLENGE;
 		auth_frame->length = SIR_MAC_SAP_AUTH_CHALLENGE_LENGTH;
 		qdf_mem_copy(auth_frame->challengeText,
@@ -293,7 +294,7 @@ static void lim_process_auth_open_system_algo(struct mac_context *mac_ctx,
 	auth_frame->authAlgoNumber = rx_auth_frm_body->authAlgoNumber;
 	auth_frame->authTransactionSeqNumber =
 			rx_auth_frm_body->authTransactionSeqNumber + 1;
-	auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS;
+	auth_frame->authStatusCode = STATUS_SUCCESS;
 	lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa,
 					LIM_NO_WEP_IN_FC,
 					pe_session);
@@ -625,7 +626,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 		auth_frame->authTransactionSeqNumber =
 			rx_auth_frm_body->authTransactionSeqNumber + 1;
 		auth_frame->authStatusCode =
-			eSIR_MAC_UNSPEC_FAILURE_STATUS;
+			STATUS_UNSPECIFIED_FAILURE;
 
 		lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -650,7 +651,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
 			auth_frame->authStatusCode =
-				eSIR_MAC_WME_INVALID_PARAMS_STATUS;
+				STATUS_UNSPECIFIED_FAILURE;
 
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -686,7 +687,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS;
+				STATUS_NOT_SUPPORTED_AUTH_ALG;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -707,7 +708,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 		auth_frame->authTransactionSeqNumber =
 			rx_auth_frm_body->authTransactionSeqNumber + 1;
 		auth_frame->authStatusCode =
-			eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS;
+			STATUS_NOT_SUPPORTED_AUTH_ALG;
 
 		lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa,
@@ -742,8 +743,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 		 */
 		if (LIM_IS_STA_ROLE(pe_session) &&
 		    (pe_session->limSmeState == eLIM_SME_WT_REASSOC_STATE) &&
-		    (rx_auth_frm_body->authStatusCode ==
-				eSIR_MAC_SUCCESS_STATUS) &&
+		    (rx_auth_frm_body->authStatusCode == STATUS_SUCCESS) &&
 		    (pe_session->ftPEContext.pFTPreAuthReq) &&
 		    (!qdf_mem_cmp(
 			pe_session->ftPEContext.pFTPreAuthReq->preAuthbssId,
@@ -789,7 +789,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 	}
 
 	if (rx_auth_frm_body->authStatusCode ==
-			eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS) {
+			STATUS_NOT_SUPPORTED_AUTH_ALG) {
 		/*
 		 * Interoperability workaround: Linksys WAP4400N is returning
 		 * wrong authType in OpenAuth response in case of
@@ -830,7 +830,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 		}
 	}
 
-	if (rx_auth_frm_body->authStatusCode != eSIR_MAC_SUCCESS_STATUS) {
+	if (rx_auth_frm_body->authStatusCode != STATUS_SUCCESS) {
 		/*
 		 * Authentication failure.
 		 * Return Auth confirm with received failure code to SME
@@ -901,7 +901,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS;
+				STATUS_NOT_SUPPORTED_AUTH_ALG;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 					mac_hdr->sa, LIM_NO_WEP_IN_FC,
 					pe_session);
@@ -935,7 +935,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 				rx_auth_frm_body->authTransactionSeqNumber + 1;
 
 				auth_frame->authStatusCode =
-					eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+					STATUS_CHALLENGE_FAIL;
 
 				lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 							 mac_hdr->sa,
@@ -956,7 +956,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 				rx_auth_frm_body->authTransactionSeqNumber
 				+ 1));
 		((tpSirMacAuthFrameBody)plainbody)->authStatusCode =
-			eSIR_MAC_SUCCESS_STATUS;
+			STATUS_SUCCESS;
 		((tpSirMacAuthFrameBody)plainbody)->type =
 			WLAN_ELEMID_CHALLENGE;
 		((tpSirMacAuthFrameBody)plainbody)->length =
@@ -1007,7 +1007,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
 		auth_frame->authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_4;
 		auth_frame->authStatusCode =
-			eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS;
+			STATUS_UNKNOWN_AUTH_TRANSACTION;
 		lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 			mac_hdr->sa, LIM_NO_WEP_IN_FC,
 			pe_session);
@@ -1029,7 +1029,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+				STATUS_CHALLENGE_FAIL;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 					mac_hdr->sa,
 					LIM_NO_WEP_IN_FC,
@@ -1051,7 +1051,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS;
+				STATUS_UNKNOWN_AUTH_TRANSACTION;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -1071,7 +1071,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_RSP_TIMEOUT_STATUS;
+				STATUS_AUTH_TIMEOUT;
 
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -1081,7 +1081,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			return;
 		}
 		if (rx_auth_frm_body->authStatusCode !=
-				eSIR_MAC_SUCCESS_STATUS) {
+				STATUS_SUCCESS) {
 			/*
 			 * Received Authenetication Frame 3 with status code
 			 * other than success. Wait until Auth response timeout
@@ -1117,7 +1117,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_SUCCESS_STATUS;
+				STATUS_SUCCESS;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -1136,7 +1136,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+				STATUS_CHALLENGE_FAIL;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -1207,7 +1207,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		return;
 	}
 
-	if (rx_auth_frm_body->authStatusCode == eSIR_MAC_SUCCESS_STATUS) {
+	if (rx_auth_frm_body->authStatusCode == STATUS_SUCCESS) {
 		/*
 		 * Authentication Success, Inform SME of same.
 		 */
@@ -1398,7 +1398,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+				STATUS_CHALLENGE_FAIL;
 			/* Log error */
 			pe_err("rx Auth frm with wep bit set role: %d "QDF_MAC_ADDR_FMT,
 				GET_LIM_SYSTEM_ROLE(pe_session),
@@ -1443,7 +1443,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+				STATUS_CHALLENGE_FAIL;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -1470,7 +1470,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS;
+				STATUS_UNKNOWN_AUTH_TRANSACTION;
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
 				pe_session);
@@ -1498,7 +1498,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
 			auth_frame->authStatusCode =
-				eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS;
+				STATUS_UNKNOWN_AUTH_TRANSACTION;
 
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -1531,7 +1531,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				auth_frame->authTransactionSeqNumber =
 							SIR_MAC_AUTH_FRAME_4;
 				auth_frame->authStatusCode =
-					eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+					STATUS_CHALLENGE_FAIL;
 				lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 						mac_hdr->sa, LIM_NO_WEP_IN_FC,
 						pe_session);
@@ -1553,8 +1553,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
 			auth_frame->authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;
-			auth_frame->authStatusCode =
-				eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+			auth_frame->authStatusCode = STATUS_CHALLENGE_FAIL;
 
 			lim_send_auth_mgmt_frame(mac_ctx, auth_frame,
 				mac_hdr->sa, LIM_NO_WEP_IN_FC,
@@ -1836,10 +1835,10 @@ QDF_STATUS lim_process_auth_frame_no_session(struct mac_context *mac, uint8_t *p
 		       (uint32_t) mac->lim.gLimNumPreAuthContexts);
 	switch (pRxAuthFrameBody->authTransactionSeqNumber) {
 	case SIR_MAC_AUTH_FRAME_2:
-		if (pRxAuthFrameBody->authStatusCode != eSIR_MAC_SUCCESS_STATUS) {
+		if (pRxAuthFrameBody->authStatusCode != STATUS_SUCCESS) {
 			pe_err("Auth status code received is %d",
 				(uint32_t) pRxAuthFrameBody->authStatusCode);
-			if (eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS ==
+			if (STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ==
 			    pRxAuthFrameBody->authStatusCode)
 				ret_status = QDF_STATUS_E_NOSPC;
 		} else {

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

@@ -557,7 +557,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 		 */
 		lim_post_reassoc_failure(mac_ctx,
 				eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE,
-				eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				STATUS_UNSPECIFIED_FAILURE,
 				pe_session);
 		return;
 	}

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

@@ -1834,7 +1834,7 @@ bool lim_verify_fils_params_assoc_rsp(struct mac_context *mac_ctx,
 
 verify_fils_params_fails:
 	assoc_cnf->resultCode = eSIR_SME_ASSOC_REFUSED;
-	assoc_cnf->protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	assoc_cnf->protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	return false;
 }
 

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

@@ -94,11 +94,11 @@ static void lim_process_sae_msg_sta(struct mac_context *mac,
 		if (sae_msg->sae_status == IEEE80211_STATUS_SUCCESS)
 			lim_restore_from_auth_state(mac,
 						    eSIR_SME_SUCCESS,
-						    eSIR_MAC_SUCCESS_STATUS,
+						    STATUS_SUCCESS,
 						    session);
 		else
 			lim_restore_from_auth_state(mac, eSIR_SME_AUTH_REFUSED,
-				eSIR_MAC_UNSPEC_FAILURE_STATUS, session);
+				STATUS_UNSPECIFIED_FAILURE, session);
 		break;
 	default:
 		/* SAE msg is received in unexpected state */

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

@@ -92,7 +92,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 			QDF_MAC_ADDR_REF(reassoc_req->peerMacAddr));
 		lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState);
 		reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
-		reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		reassoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		goto end;
 	}
 
@@ -118,7 +118,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 		 * Return Reassoc confirm with not authenticated
 		 */
 		reassoc_cnf.resultCode = eSIR_SME_STA_NOT_AUTHENTICATED;
-		reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		reassoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 
 		goto end;
 	}
@@ -141,7 +141,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 				      sizeof(struct pe_session), session);
 	return;
 end:
-	reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	reassoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	/* Update PE sessio Id */
 	reassoc_cnf.sessionId = reassoc_req->sessionId;
 	/* Free up buffer allocated for reassocReq */
@@ -420,7 +420,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
 		/* Return Reassoc confirm with */
 		/* Resources Unavailable */
 		mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
-		mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlmReassocCnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		goto end;
 	}
 
@@ -520,7 +520,7 @@ end:
 		}
 
 	mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE;
-	mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	mlmReassocCnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	/* Update PE session Id */
 	if (pe_session)
 		mlmReassocCnf.sessionId = pe_session->peSessionId;

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

@@ -358,7 +358,7 @@ failure:
 	session_entry->limMlmState = eLIM_MLM_IDLE_STATE;
 	mlm_join_cnf.resultCode = eSIR_SME_PEER_CREATE_FAILED;
 	mlm_join_cnf.sessionId = session_entry->peSessionId;
-	mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	mlm_join_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	lim_post_sme_message(mac, LIM_MLM_JOIN_CNF, (uint32_t *) &mlm_join_cnf);
 }
 
@@ -464,7 +464,7 @@ error:
 		session->pLimMlmJoinReq = NULL;
 	mlmjoin_cnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
 	mlmjoin_cnf.sessionId = sessionid;
-	mlmjoin_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	mlmjoin_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF,
 		(uint32_t *)&mlmjoin_cnf);
 
@@ -689,8 +689,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
 		pe_debug("Already have pre-auth context with peer: "
 		    QDF_MAC_ADDR_FMT,
 		    QDF_MAC_ADDR_REF(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr));
-		mlm_auth_cnf.resultCode = (tSirResultCodes)
-						eSIR_MAC_SUCCESS_STATUS;
+		mlm_auth_cnf.resultCode = (tSirResultCodes)STATUS_SUCCESS;
 		goto end;
 	} else {
 		num_preauth_ctx = mac_ctx->mlme_cfg->lfr.max_num_pre_auth;
@@ -871,7 +870,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg
 			QDF_MAC_ADDR_REF(mlm_assoc_req->peerMacAddr));
 		lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState);
 		mlm_assoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
-		mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		goto end;
 	}
 
@@ -1556,7 +1555,7 @@ void lim_process_join_failure_timeout(struct mac_context *mac_ctx)
 			QDF_MAC_ADDR_REF(session->bssId));
 
 		mlm_join_cnf.resultCode = eSIR_SME_JOIN_TIMEOUT_RESULT_CODE;
-		mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_join_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		session->limMlmState = eLIM_MLM_IDLE_STATE;
 		MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE,
 				 session->peSessionId, session->limMlmState));
@@ -1953,7 +1952,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 		}
 
 		mlm_assoc_cnf.resultCode = eSIR_SME_ASSOC_TIMEOUT_RESULT_CODE;
-		mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		/* Update PE session Id */
 		mlm_assoc_cnf.sessionId = session->peSessionId;
 		if (msg_type == LIM_ASSOC) {
@@ -1980,6 +1979,6 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 				 session->peSessionId, session->limMlmState));
 		lim_restore_pre_reassoc_state(mac_ctx,
 				eSIR_SME_REASSOC_TIMEOUT_RESULT_CODE,
-				eSIR_MAC_UNSPEC_FAILURE_STATUS, session);
+				STATUS_UNSPECIFIED_FAILURE, session);
 	}
 }

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

@@ -524,8 +524,7 @@ void lim_process_mlm_auth_cnf(struct mac_context *mac_ctx, uint32_t *msg)
 
 	if ((auth_type == eSIR_AUTO_SWITCH) &&
 		(auth_cnf->authType == eSIR_SHARED_KEY) &&
-		((eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS ==
-			auth_cnf->protStatusCode) ||
+		((auth_cnf->protStatusCode == STATUS_NOT_SUPPORTED_AUTH_ALG) ||
 		(auth_cnf->resultCode == eSIR_SME_AUTH_TIMEOUT_RESULT_CODE))) {
 		/*
 		 * When shared authentication fails with reason
@@ -1467,7 +1466,7 @@ void lim_process_sta_mlm_add_sta_rsp(struct mac_context *mac_ctx,
 			mlm_assoc_cnf.resultCode =
 				eSIR_SME_JOIN_DEAUTH_FROM_AP_DURING_ADD_STA;
 			mlm_assoc_cnf.protStatusCode =
-					   eSIR_MAC_UNSPEC_FAILURE_STATUS;
+					   STATUS_UNSPECIFIED_FAILURE;
 			goto end;
 		}
 	}
@@ -1536,7 +1535,7 @@ void lim_process_sta_mlm_add_sta_rsp(struct mac_context *mac_ctx,
 		else
 			mlm_assoc_cnf.resultCode =
 				(tSirResultCodes) eSIR_SME_REFUSED;
-		mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	}
 end:
 	if (msg->bodyptr) {
@@ -1862,7 +1861,7 @@ void lim_process_ap_mlm_del_sta_rsp(struct mac_context *mac_ctx,
 				sta_ds->mlmStaContext.subType, true,
 				sta_ds->mlmStaContext.authType, sta_ds->assocId,
 				true,
-				eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				STATUS_UNSPECIFIED_FAILURE,
 				session_entry);
 		}
 		return;
@@ -1961,7 +1960,7 @@ void lim_process_ap_mlm_add_sta_rsp(struct mac_context *mac,
 				       sta->mlmStaContext.subType,
 				       true, sta->mlmStaContext.authType,
 				       sta->assocId, true,
-				       eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				       STATUS_UNSPECIFIED_FAILURE,
 				       pe_session);
 		goto end;
 	}
@@ -2161,7 +2160,7 @@ joinFailure:
 
 		/* Send Join response to Host */
 		lim_handle_sme_join_result(mac_ctx, eSIR_SME_REFUSED,
-			eSIR_MAC_UNSPEC_FAILURE_STATUS, session_entry);
+			STATUS_UNSPECIFIED_FAILURE, session_entry);
 	}
 
 }
@@ -2244,7 +2243,7 @@ static void lim_process_sta_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 	} else {
 		pe_err("SessionId: %d ADD_BSS failed!",
 			session_entry->peSessionId);
-		mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlm_assoc_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		/* Return Assoc confirm to SME with failure */
 		if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
 				session_entry->limMlmState)
@@ -2627,7 +2626,7 @@ end:
 		mlmReassocCnf.sessionId = 0;
 	}
 
-	mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	mlmReassocCnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	/* Update PE sessio Id */
 	mlmReassocCnf.sessionId = pe_session->peSessionId;
 
@@ -2717,7 +2716,7 @@ static void lim_process_switch_channel_join_req(
 		session_entry->limMlmState = eLIM_MLM_JOINED_STATE;
 		join_cnf.sessionId = session_entry->peSessionId;
 		join_cnf.resultCode = eSIR_SME_SUCCESS;
-		join_cnf.protStatusCode = eSIR_MAC_SUCCESS_STATUS;
+		join_cnf.protStatusCode = STATUS_SUCCESS;
 		lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF,
 				     (uint32_t *)&join_cnf);
 		return;
@@ -2789,7 +2788,7 @@ error:
 		join_cnf.sessionId = 0;
 	}
 	join_cnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
-	join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	join_cnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF, (uint32_t *)&join_cnf);
 }
 

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

@@ -1639,7 +1639,7 @@ end:
 	pe_debug("Send failure status on vdev_id: %d with ret_code: %d",
 		vdev_id, ret_code);
 	lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, ret_code,
-		eSIR_MAC_UNSPEC_FAILURE_STATUS, session, vdev_id);
+		STATUS_UNSPECIFIED_FAILURE, session, vdev_id);
 }
 
 uint8_t lim_get_max_tx_power(struct mac_context *mac,
@@ -1726,7 +1726,7 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 		if (session_entry)
 			lim_handle_sme_join_result(mac_ctx,
 					eSIR_SME_INVALID_PARAMETERS,
-					eSIR_MAC_UNSPEC_FAILURE_STATUS,
+					STATUS_UNSPECIFIED_FAILURE,
 					session_entry);
 		goto end;
 	}
@@ -1954,7 +1954,7 @@ end:
 	 * (note session_entry may be NULL, but that's OK)
 	 */
 	lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP,
-				      ret_code, eSIR_MAC_UNSPEC_FAILURE_STATUS,
+				      ret_code, STATUS_UNSPECIFIED_FAILURE,
 				      session_entry, vdev_id);
 }
 
@@ -2880,8 +2880,8 @@ void __lim_process_sme_assoc_cnf_new(struct mac_context *mac_ctx, uint32_t msg_t
 		 * denied STA we need to remove this HAL entry.
 		 * So to do that set updateContext to 1
 		 */
-		enum mac_status_code mac_status_code =
-					eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		enum wlan_status_code mac_status_code =
+					STATUS_UNSPECIFIED_FAILURE;
 
 		if (!sta_ds->mlmStaContext.updateContext)
 			sta_ds->mlmStaContext.updateContext = 1;
@@ -2890,9 +2890,9 @@ void __lim_process_sme_assoc_cnf_new(struct mac_context *mac_ctx, uint32_t msg_t
 			 assoc_cnf.mac_status_code);
 		if (assoc_cnf.mac_status_code)
 			mac_status_code = assoc_cnf.mac_status_code;
-		if (assoc_cnf.mac_status_code == eSIR_MAC_INVALID_PMKID ||
+		if (assoc_cnf.mac_status_code == STATUS_INVALID_PMKID ||
 		    assoc_cnf.mac_status_code ==
-			eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS)
+			STATUS_NOT_SUPPORTED_AUTH_ALG)
 			add_pre_auth_context = false;
 
 		lim_reject_association(mac_ctx, sta_ds->staAddr,

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

@@ -129,7 +129,7 @@ void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 			mlmReassocCnf.resultCode =
 					eSIR_SME_RESOURCES_UNAVAILABLE;
 			mlmReassocCnf.protStatusCode =
-					eSIR_MAC_UNSPEC_FAILURE_STATUS;
+					STATUS_UNSPECIFIED_FAILURE;
 			lim_delete_dph_hash_entry(mac, pe_session->bssId,
 				DPH_STA_HASH_INDEX_PEER, pe_session);
 			goto error;
@@ -198,7 +198,7 @@ void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 			mlmReassocCnf.resultCode =
 				eSIR_SME_RESOURCES_UNAVAILABLE;
 			mlmReassocCnf.protStatusCode =
-				eSIR_MAC_UNSPEC_FAILURE_STATUS;
+				STATUS_UNSPECIFIED_FAILURE;
 			qdf_mem_free(assocRsp);
 			mac->lim.gLimAssocResponseData = NULL;
 			qdf_mem_free(beacon_struct);
@@ -321,7 +321,7 @@ void lim_handle_add_bss_in_re_assoc_context(struct mac_context *mac,
 			mlmReassocCnf.resultCode =
 				eSIR_SME_RESOURCES_UNAVAILABLE;
 			mlmReassocCnf.protStatusCode =
-				eSIR_MAC_UNSPEC_FAILURE_STATUS;
+				STATUS_UNSPECIFIED_FAILURE;
 			qdf_mem_free(assocRsp);
 			mac->lim.gLimAssocResponseData = NULL;
 			qdf_mem_free(pBeaconStruct);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 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
@@ -504,7 +504,7 @@ void lim_send_retry_reassoc_req_frame(struct mac_context *mac,
 		/* Return Reassoc confirm with */
 		/* Resources Unavailable */
 		mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
-		mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+		mlmReassocCnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 		goto end;
 	}
 
@@ -523,7 +523,7 @@ end:
 		pTmpMlmReassocReq = NULL;
 	}
 	mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE;
-	mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+	mlmReassocCnf.protStatusCode = STATUS_UNSPECIFIED_FAILURE;
 	/* Update PE sessio Id */
 	mlmReassocCnf.sessionId = pe_session->peSessionId;
 

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

@@ -1408,7 +1408,7 @@ lim_send_assoc_rsp_mgmt_frame(
 						    &frm.he_6ghz_band_cap);
 		}
 #ifdef WLAN_FEATURE_11W
-		if (eSIR_MAC_TRY_AGAIN_LATER == status_code) {
+		if (status_code == STATUS_ASSOC_REJECTED_TEMPORARILY) {
 			max_retries =
 			mac_ctx->mlme_cfg->gen.pmf_sa_query_max_retries;
 			retry_int =
@@ -2758,8 +2758,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 	case SIR_MAC_AUTH_FRAME_2:
 		if ((auth_frame->authAlgoNumber == eSIR_OPEN_SYSTEM) ||
 		    ((auth_frame->authAlgoNumber == eSIR_SHARED_KEY) &&
-			(auth_frame->authStatusCode !=
-			 eSIR_MAC_SUCCESS_STATUS))) {
+			(auth_frame->authStatusCode != STATUS_SUCCESS))) {
 			/*
 			 * Allocate buffer for Authenticaton frame of size
 			 * equal to management frame header length plus
@@ -5115,7 +5114,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 	frm.DialogToken.token = dialog_token;
 	frm.Status.status = status_code;
 	if (mac_ctx->reject_addba_req) {
-		frm.Status.status = eSIR_MAC_REQ_DECLINED_STATUS;
+		frm.Status.status = STATUS_REQUEST_DECLINED;
 		pe_err("refused addba req");
 	}
 	frm.addba_param_set.tid = tid;

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

@@ -1254,7 +1254,7 @@ void lim_send_sme_addts_rsp(struct mac_context *mac,
 
 	rsp->messageType = eWNI_SME_ADDTS_RSP;
 	rsp->rc = status;
-	rsp->rsp.status = (enum mac_status_code)status;
+	rsp->rsp.status = (enum wlan_status_code)status;
 	rsp->rsp.tspec = tspec;
 	rsp->sessionId = smesessionId;
 

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

@@ -4690,14 +4690,14 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 	/* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */
 	if (ACTION_CATEGORY_QOS == *pFrame) {
 		pAddTs->dialogToken = addts.DialogToken.token;
-		pAddTs->status = (enum mac_status_code)addts.Status.status;
+		pAddTs->status = (enum wlan_status_code)addts.Status.status;
 
 		if (addts.TSDelay.present) {
 			convert_ts_delay(mac, &pAddTs->delay, &addts.TSDelay);
 		}
 		/* TS Delay is present iff status indicates its presence */
-		if (eSIR_MAC_TS_NOT_CREATED_STATUS == pAddTs->status
-		    && !addts.TSDelay.present) {
+		if (pAddTs->status == STATUS_TS_NOT_CREATED &&
+		    !addts.TSDelay.present) {
 			pe_warn("Missing TSDelay IE");
 		}
 
@@ -4779,7 +4779,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 	} else {
 		pAddTs->dialogToken = wmmaddts.DialogToken.token;
 		pAddTs->status =
-			(enum mac_status_code)wmmaddts.StatusCode.statusCode;
+			(enum wlan_status_code)wmmaddts.StatusCode.statusCode;
 
 		if (wmmaddts.WMMTSPEC.present) {
 			pAddTs->wmeTspecPresent = 1;

core/sap/src/sap_module.c

@@ -275,7 +275,7 @@ static void wlansap_owe_cleanup(struct sap_context *sap_ctx)
 			qdf_mem_free(owe_assoc_ind);
 			assoc_ind->owe_ie = NULL;
 			assoc_ind->owe_ie_len = 0;
-			assoc_ind->owe_status = eSIR_MAC_UNSPEC_FAILURE_STATUS;
+			assoc_ind->owe_status = STATUS_UNSPECIFIED_FAILURE;
 			status = sme_update_owe_info(mac, assoc_ind);
 			qdf_mem_free(assoc_ind);
 		} else {

core/sme/src/csr/csr_api_roam.c

@@ -9300,7 +9300,7 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 	 * bss fail and supplicant issues connect request back to the same
 	 * AP.
 	 */
-	if (reason_code == eSIR_MAC_INVALID_PMKID) {
+	if (reason_code == STATUS_INVALID_PMKID) {
 		pmksa = qdf_mem_malloc(sizeof(*pmksa));
 		if (!pmksa)
 			return;
@@ -11520,7 +11520,7 @@ static bool csr_is_sae_peer_allowed(struct mac_context *mac_ctx,
 				    struct csr_roam_session *session,
 				    tSirMacAddr peer_mac_addr,
 				    tDot11fIERSN *rsn_ie,
-				    enum mac_status_code *mac_status_code)
+				    enum wlan_status_code *mac_status_code)
 {
 	bool is_allowed = false;
 
@@ -11530,7 +11530,7 @@ static bool csr_is_sae_peer_allowed(struct mac_context *mac_ctx,
 
 	/* Allow the peer with valid PMKID */
 	if (!rsn_ie->pmkid_count) {
-		*mac_status_code = eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS;
+		*mac_status_code = STATUS_NOT_SUPPORTED_AUTH_ALG;
 		sme_debug("No PMKID present in RSNIE; Tried to use SAE AKM after non-SAE authentication");
 	} else if (csr_is_pmkid_found_for_peer(mac_ctx, session, peer_mac_addr,
 					       &rsn_ie->pmkid[0][0],
@@ -11538,7 +11538,7 @@ static bool csr_is_sae_peer_allowed(struct mac_context *mac_ctx,
 		sme_debug("Valid PMKID found for SAE peer");
 		is_allowed = true;
 	} else {
-		*mac_status_code = eSIR_MAC_INVALID_PMKID;
+		*mac_status_code = STATUS_INVALID_PMKID;
 		sme_debug("No valid PMKID found for SAE peer");
 	}
 
@@ -11656,7 +11656,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	QDF_STATUS status;
 	struct csr_roam_info *roam_info;
 	struct assoc_ind *pAssocInd;
-	enum mac_status_code mac_status_code = eSIR_MAC_SUCCESS_STATUS;
+	enum wlan_status_code mac_status_code = STATUS_SUCCESS;
 	enum csr_akm_type csr_akm_type;
 
 	sme_debug("Receive WNI_SME_ASSOC_IND from SME");
@@ -16111,7 +16111,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac,
 QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac,
 				  struct assoc_ind *pAssocInd,
 				  QDF_STATUS Halstatus,
-				  enum mac_status_code mac_status_code)
+				  enum wlan_status_code mac_status_code)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct assoc_cnf *pMsg;

core/sme/src/csr/csr_inside_api.h

@@ -273,7 +273,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac,
 QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac,
 				  struct assoc_ind *pAssocInd,
 				  QDF_STATUS status,
-				  enum mac_status_code mac_status_code);
+				  enum wlan_status_code mac_status_code);
 QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac,
 					 uint32_t sessionId,
 					 eCsrRoamBssType bssType,

core/sme/src/qos/sme_qos.c

@@ -2876,7 +2876,7 @@ sme_qos_ese_save_tspec_response(struct mac_context *mac, uint8_t sessionId,
 	pAddtsRsp->rc = QDF_STATUS_SUCCESS;
 	pAddtsRsp->sessionId = sessionId;
 	pAddtsRsp->rsp.dialogToken = 0;
-	pAddtsRsp->rsp.status = eSIR_MAC_SUCCESS_STATUS;
+	pAddtsRsp->rsp.status = STATUS_SUCCESS;
 	pAddtsRsp->rsp.wmeTspecPresent = pTspec->present;
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d",