diff --git a/components/son/dispatcher/src/son_api.c b/components/son/dispatcher/src/son_api.c
index 65bdc090cc..845ccaa36b 100644
--- a/components/son/dispatcher/src/son_api.c
+++ b/components/son/dispatcher/src/son_api.c
@@ -373,7 +373,7 @@ void wlan_son_ind_assoc_req_frm(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_peer *peer;
 	struct wlan_lmac_if_rx_ops *rx_ops;
 	struct wlan_objmgr_psoc *psoc;
-	uint16_t assocstatus = IEEE80211_STATUS_UNSPECIFIED;
+	uint16_t assocstatus = STATUS_UNSPECIFIED_FAILURE;
 	uint16_t sub_type = IEEE80211_FC0_SUBTYPE_ASSOC_REQ;
 
 	if (!vdev) {
@@ -400,7 +400,7 @@ void wlan_son_ind_assoc_req_frm(struct wlan_objmgr_vdev *vdev,
 	if (is_reassoc)
 		sub_type = IEEE80211_FC0_SUBTYPE_REASSOC_REQ;
 	if (QDF_IS_STATUS_SUCCESS(status))
-		assocstatus = IEEE80211_STATUS_SUCCESS;
+		assocstatus = STATUS_SUCCESS;
 	son_debug("subtype %u frame_len %u assocstatus %u",
 		  sub_type, frame_len, assocstatus);
 	rx_ops->son_rx_ops.process_mgmt_frame(vdev, peer, sub_type,
diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c
index fbcf59f62d..40452c642f 100644
--- a/core/mac/src/pe/lim/lim_process_deauth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c
@@ -342,7 +342,7 @@ static void lim_process_sae_auth_msg(struct mac_context *mac_ctx,
 		return;
 
 	sae_msg->vdev_id = pe_session->vdev_id;
-	sae_msg->sae_status = IEEE80211_STATUS_UNSPECIFIED;
+	sae_msg->sae_status = STATUS_UNSPECIFIED_FAILURE;
 	sae_msg->result_code = eSIR_SME_AUTH_REFUSED;
 	qdf_mem_copy(sae_msg->peer_mac_addr, addr, QDF_MAC_ADDR_SIZE);
 	lim_process_sae_msg(mac_ctx, sae_msg);
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index f86d812805..36ebedb97b 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -92,7 +92,7 @@ static void lim_process_sae_msg_sta(struct mac_context *mac,
 							eLIM_AUTH_SAE_TIMER);
 		lim_sae_auth_cleanup_retry(mac, session->vdev_id);
 		/* success */
-		if (sae_msg->sae_status == IEEE80211_STATUS_SUCCESS)
+		if (sae_msg->sae_status == STATUS_SUCCESS)
 			lim_restore_from_auth_state(mac,
 						    eSIR_SME_SUCCESS,
 						    STATUS_SUCCESS,
@@ -141,7 +141,7 @@ static void lim_process_sae_msg_ap(struct mac_context *mac,
 
 	assoc_req = &sta_pre_auth_ctx->assoc_req;
 
-	if (sae_msg->sae_status != IEEE80211_STATUS_SUCCESS) {
+	if (sae_msg->sae_status != STATUS_SUCCESS) {
 		pe_debug("SAE authentication failed for "
 			 QDF_MAC_ADDR_FMT " status: %u",
 			 QDF_MAC_ADDR_REF(sae_msg->peer_mac_addr),