diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 8a14b18cc64a..462ad0ecbd0a 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2580,7 +2580,7 @@ void lim_update_lost_link_info(struct mac_context *mac, struct pe_session *sessi
 	pe_debug("post eWNI_SME_LOST_LINK_INFO_IND, bss_idx: %d rssi: %d",
 		lost_link_info->vdev_id, lost_link_info->rssi);
 
-	lim_sys_process_mmh_msg_api(mac, &mmh_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmh_msg);
 }
 
 /**
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 92e79d7cd265..74271211e0ea 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -4771,7 +4771,7 @@ void lim_send_sme_unprotected_mgmt_frame_ind(struct mac_context *mac, uint8_t fr
 	mmhMsg.bodyptr = pSirSmeMgmtFrame;
 	mmhMsg.bodyval = 0;
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 	return;
 }
 #endif
@@ -4809,7 +4809,7 @@ void lim_send_sme_tsm_ie_ind(struct mac_context *mac, struct pe_session *pe_sess
 	mmhMsg.bodyptr = pSirSmeTsmIeInd;
 	mmhMsg.bodyval = 0;
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 	return;
 }
 #endif /* FEATURE_WLAN_ESE */
diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c
index f0cd42470159..755351bb543d 100644
--- a/core/mac/src/pe/lim/lim_ft_preauth.c
+++ b/core/mac/src/pe/lim/lim_ft_preauth.c
@@ -650,7 +650,7 @@ void lim_post_ft_pre_auth_rsp(struct mac_context *mac_ctx,
 		lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PREAUTH_DONE,
 				      session, status, 0);
 #endif
-	lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg);
 }
 
 /**
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index c076436b639e..9d169ed6e09c 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-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
@@ -382,7 +382,7 @@ lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
 		mmh_msg.type = eWNI_SME_EXT_CHANGE_CHANNEL_IND;
 		mmh_msg.bodyptr = ext_cng_chan_ind;
 		mmh_msg.bodyval = 0;
-		lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT);
+		lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg);
 	}
 	return;
 } /*** end lim_process_ext_channel_switch_action_frame() ***/
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 4147f0fb7897..a9482e617340 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -176,7 +176,7 @@ static void lim_process_dual_mac_cfg_resp(struct mac_context *mac, void *body)
 	msg.bodyptr = param;
 	msg.bodyval = 0;
 	pe_debug("Send eWNI_SME_SET_DUAL_MAC_CFG_RESP to SME");
-	lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &msg);
 	return;
 }
 
@@ -236,7 +236,7 @@ static void lim_process_set_hw_mode_resp(struct mac_context *mac, void *body)
 	msg.bodyptr = param;
 	msg.bodyval = 0;
 	pe_err("Send eWNI_SME_SET_HW_MODE_RESP to SME");
-	lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &msg);
 	return;
 }
 
@@ -283,7 +283,7 @@ static void lim_process_set_antenna_resp(struct mac_context *mac, void *body)
 	msg.bodyptr = param;
 	msg.bodyval = 0;
 	pe_debug("Send eWNI_SME_SET_ANTENNA_MODE_RESP to SME");
-	lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &msg);
 	return;
 }
 
@@ -396,7 +396,7 @@ static void lim_process_hw_mode_trans_ind(struct mac_context *mac, void *body)
 	msg.bodyptr = param;
 	msg.bodyval = 0;
 	pe_err("Send eWNI_SME_HW_MODE_TRANS_IND to SME");
-	lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &msg);
 	return;
 }
 
@@ -551,7 +551,7 @@ __lim_pno_match_fwd_bcn_probepsp(struct mac_context *pmac, uint8_t *rx_pkt_info,
 	mmh_msg.type = msg_type;
 	mmh_msg.bodyptr = result;
 	mmh_msg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(pmac, &mmh_msg, ePROT);
+	lim_sys_process_mmh_msg_api(pmac, &mmh_msg);
 }
 
 
@@ -614,7 +614,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(struct mac_context *pmac, uint8_t *rx_pkt_i
 	mmh_msg.type = msg_type;
 	mmh_msg.bodyptr = result;
 	mmh_msg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(pmac, &mmh_msg, ePROT);
+	lim_sys_process_mmh_msg_api(pmac, &mmh_msg);
 }
 
 static void
diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
index 5bcda008bbe5..9da8384956fd 100644
--- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
@@ -568,7 +568,7 @@ lim_send_sme_probe_req_ind(struct mac_context *mac,
 	qdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIE, pProbeReqIE,
 		     ProbeReqIELen);
 
-	if (lim_sys_process_mmh_msg_api(mac, &msgQ, ePROT) != QDF_STATUS_SUCCESS)
+	if (lim_sys_process_mmh_msg_api(mac, &msgQ) != QDF_STATUS_SUCCESS)
 		pe_err("couldnt send the probe req to hdd");
 
 } /*** end lim_send_sme_probe_req_ind() ***/
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 908e573ffbeb..71e5cba91a1e 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -177,7 +177,7 @@ fail:
 	resp_msg.type = eWNI_SME_SET_HW_MODE_RESP;
 	resp_msg.bodyptr = param;
 	resp_msg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &resp_msg);
 	return status;
 }
 
@@ -245,7 +245,7 @@ fail:
 	resp_msg.type = eWNI_SME_SET_DUAL_MAC_CFG_RESP;
 	resp_msg.bodyptr = param;
 	resp_msg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &resp_msg);
 	return status;
 }
 
@@ -311,7 +311,7 @@ fail:
 	resp_msg.type = eWNI_SME_SET_ANTENNA_MODE_RESP;
 	resp_msg.bodyptr = param;
 	resp_msg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &resp_msg);
 	return status;
 }
 
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 4014aef2d962..7533a95ee3b5 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -112,7 +112,7 @@ lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 		break;
 	}
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
-	lim_sys_process_mmh_msg_api(mac_ctx, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac_ctx, &msg);
 }
 
 /**
@@ -186,7 +186,7 @@ static void lim_send_sme_join_reassoc_rsp_after_resume(struct mac_context *mac_c
 	msg.bodyptr = sme_join_rsp;
 	msg.bodyval = 0;
 	MTRACE(mac_trace(mac_ctx, TRACE_CODE_TX_SME_MSG, NO_SESSION, msg.type));
-	lim_sys_process_mmh_msg_api(mac_ctx, &msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac_ctx, &msg);
 }
 
 /**
@@ -681,7 +681,7 @@ lim_send_sme_start_bss_rsp(struct mac_context *mac,
 			      pe_session, (uint16_t) resultCode, 0);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 } /*** end lim_send_sme_start_bss_rsp() ***/
 
 void lim_send_sme_disassoc_deauth_ntf(struct mac_context *mac,
@@ -696,7 +696,7 @@ void lim_send_sme_disassoc_deauth_ntf(struct mac_context *mac,
 
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 }
 
 /**
@@ -946,7 +946,7 @@ lim_send_sme_disassoc_ind(struct mac_context *mac, tpDphHashNode pStaDs,
 			      0, (uint16_t) pStaDs->mlmStaContext.disassocReason);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 } /*** end lim_send_sme_disassoc_ind() ***/
 
@@ -1009,7 +1009,7 @@ lim_send_sme_deauth_ind(struct mac_context *mac, tpDphHashNode pStaDs,
 			      0, pStaDs->mlmStaContext.cleanupTrigger);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 	return;
 } /*** end lim_send_sme_deauth_ind() ***/
 
@@ -1341,7 +1341,7 @@ lim_send_sme_wm_status_change_ntf(struct mac_context *mac_ctx,
 	}
 
 	MTRACE(mac_trace(mac_ctx, TRACE_CODE_TX_SME_MSG, session_id, msg.type));
-	if (QDF_STATUS_SUCCESS != lim_sys_process_mmh_msg_api(mac_ctx, &msg, ePROT)) {
+	if (QDF_STATUS_SUCCESS != lim_sys_process_mmh_msg_api(mac_ctx, &msg)) {
 		qdf_mem_free(wm_status_change_ntf);
 		pe_err("lim_sys_process_mmh_msg_api failed");
 	}
@@ -1466,7 +1466,7 @@ lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd,
 			      0);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 	return;
 }
 
@@ -1519,7 +1519,7 @@ lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts, uint32_t st
 			      (uint16_t) status, 0);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 }
 
 void
@@ -1555,7 +1555,7 @@ lim_send_sme_delts_ind(struct mac_context *mac, struct delts_req_info *delts,
 			      0);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 }
 
 #ifndef QCA_SUPPORT_CP_STATS
@@ -1611,7 +1611,7 @@ lim_send_sme_pe_statistics_rsp(struct mac_context *mac, uint16_t msgType, void *
 	mmhMsg.bodyptr = stats;
 	mmhMsg.bodyval = 0;
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	return;
 
@@ -1664,7 +1664,7 @@ void lim_send_sme_pe_ese_tsm_rsp(struct mac_context *mac,
 	mmhMsg.bodyptr = pStats;
 	mmhMsg.bodyval = 0;
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	return;
 } /*** end lim_send_sme_pe_ese_tsm_rsp() ***/
@@ -1701,7 +1701,7 @@ lim_send_sme_ibss_peer_ind(struct mac_context *mac,
 	mmhMsg.type = msgType;
 	mmhMsg.bodyptr = pNewPeerInd;
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 }
 
@@ -2104,7 +2104,7 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 			WLAN_PE_DIAG_SWITCH_CHL_IND_EVENT, session_entry,
 			QDF_STATUS_SUCCESS, QDF_STATUS_SUCCESS);
 #endif
-	lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT);
+	lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg);
 
 err:
 	qdf_mem_free(csa_params);
@@ -2173,7 +2173,7 @@ lim_send_sme_aggr_qos_rsp(struct mac_context *mac, tpSirAggrQosRsp aggrQosRsp,
 	mmhMsg.bodyval = 0;
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 smesessionId, mmhMsg.type));
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	return;
 }
@@ -2199,7 +2199,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr pe
 		pSmeMaxAssocInd->sessionId);
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 smesessionId, mmhMsg.type));
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	return;
 }
@@ -2247,7 +2247,7 @@ lim_send_sme_ap_channel_switch_resp(struct mac_context *mac,
 	mmhMsg.type = eWNI_SME_CHANNEL_CHANGE_RSP;
 	mmhMsg.bodyptr = (void *)pSmeSwithChnlParams;
 	mmhMsg.bodyval = 0;
-	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	/*
 	 * We should start beacon transmission only if the new
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index 5659a5e4c039..8e355645a5ac 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -947,12 +947,6 @@ typedef enum sHalBitVal         /* For Bit operations */
 	eHAL_SET
 } tHalBitVal;
 
-enum {
-	eHI_PRI,
-	ePROT,
-	eDBG
-};
-
 QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 					 tSirMacAddr peer_mac, uint16_t tid,
 					 struct pe_session *session,
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index a6b89e12e05b..d7ec25505bf6 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -969,15 +969,6 @@ struct scheduler_msg *lim_read_deferred_msg_q(struct mac_context *mac)
 	return msg;
 }
 
-QDF_STATUS
-lim_sys_process_mmh_msg_api(struct mac_context *mac,
-			    struct scheduler_msg *pMsg, uint8_t qType)
-{
-	/* FIXME */
-	sys_process_mmh_msg(mac, pMsg);
-	return QDF_STATUS_SUCCESS;
-}
-
 /*
  * lim_handle_update_olbc_cache() - This function update olbc cache
  *
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index 3dc47b068500..48e12f80c23a 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -273,8 +273,13 @@ void lim_handle_defer_msg_error(struct mac_context *mac,
 /* Deferred Message Queue Reset */
 void lim_reset_deferred_msg_q(struct mac_context *mac);
 
-QDF_STATUS lim_sys_process_mmh_msg_api(struct mac_context *,
-					  struct scheduler_msg *, uint8_t);
+static inline QDF_STATUS lim_sys_process_mmh_msg_api(struct mac_context *mac,
+						     struct scheduler_msg *msg)
+{
+	sys_process_mmh_msg(mac, msg);
+
+	return QDF_STATUS_SUCCESS;
+}
 
 void lim_handle_update_olbc_cache(struct mac_context *mac);
 
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c
index 8bdedc5dc98d..2251a64504c4 100644
--- a/core/mac/src/pe/rrm/rrm_api.c
+++ b/core/mac/src/pe/rrm/rrm_api.c
@@ -390,7 +390,7 @@ rrm_process_neighbor_report_response(struct mac_context *mac,
 	mmhMsg.bodyptr = pSmeNeighborRpt;
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 pe_session->peSessionId, mmhMsg.type));
-	status = lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
+	status = lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 
 	return status;
 
@@ -638,7 +638,7 @@ rrm_process_beacon_report_req(struct mac_context *mac,
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 pe_session->peSessionId, mmhMsg.type));
 	if (QDF_STATUS_SUCCESS !=
-	    lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT))
+	    lim_sys_process_mmh_msg_api(mac, &mmhMsg))
 		return eRRM_FAILURE;
 	return eRRM_SUCCESS;
 }