qcacld-3.0: change CDS_MQ_ID to QDF_MODULE_ID

As a common driver design, CDS_MQ_ID has to be replaced with
QDF_MODULE_ID

CRs-Fixed: 1104147
Change-Id: Id47770f24a6afa2dbd6b976122948b09a8873b77

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

@@ -920,7 +920,7 @@ void pe_free_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 
 uint32_t lim_post_msg_api(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 {
-	return cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) pMsg);
+	return cds_mq_post_message(QDF_MODULE_ID_PE, (cds_msg_t *) pMsg);
 
 } /*** end lim_post_msg_api() ***/
 
@@ -935,8 +935,8 @@ uint32_t lim_post_msg_api(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
  */
 uint32_t lim_post_msg_high_priority(tpAniSirGlobal mac, tSirMsgQ *msg)
 {
-	return cds_mq_post_message_by_priority(CDS_MQ_ID_PE, (cds_msg_t *)msg,
-					       HIGH_PRIORITY);
+	return cds_mq_post_message_by_priority(QDF_MODULE_ID_PE,
+					       (cds_msg_t *)msg, HIGH_PRIORITY);
 }
 
 /*--------------------------------------------------------------------------

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

@@ -165,7 +165,7 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
 	cds_message.type    = SIR_HAL_PDEV_SET_HW_MODE;
 
 	lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -238,7 +238,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
 	lim_log(mac, LOG1,
 		FL("Post SIR_HAL_PDEV_DUAL_MAC_CFG_REQ to WMA: %x %x"),
 		req_msg->scan_config, req_msg->fw_mode_config);
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
 				FL("cds_mq_post_message failed!(err=%d)"),
@@ -304,7 +304,7 @@ static QDF_STATUS lim_process_set_antenna_mode_req(tpAniSirGlobal mac,
 		FL("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d"),
 		req_msg->num_rx_chains,
 		req_msg->num_tx_chains);
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
 				FL("cds_mq_post_message failed!(err=%d)"),
@@ -4448,8 +4448,9 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 			msg.type = WMA_UPDATE_OP_MODE;
 			msg.reserved = 0;
 			msg.bodyptr = pHtOpMode;
-			if (!QDF_IS_STATUS_SUCCESS
-				    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
+			if (!QDF_IS_STATUS_SUCCESS(
+					cds_mq_post_message(QDF_MODULE_ID_WMA,
+							    &msg))) {
 				lim_log(pMac, LOGE,
 					FL
 						("%s: Not able to post WMA_UPDATE_OP_MODE message to WMA"),

core/mac/src/sys/common/src/wlan_qct_sys.c

@@ -109,7 +109,7 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context)
 	sysMsg.bodyptr = (void *)&g_stop_evt;
 
 	/* post the message.. */
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_SYS, &sysMsg);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SYS, &sysMsg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 		qdf_status = QDF_STATUS_E_BADMSG;
 
@@ -273,7 +273,7 @@ QDF_STATUS sys_mc_process_handler(struct scheduler_msg *msg)
  */
 void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 {
-	CDS_MQ_ID targetMQ = CDS_MQ_ID_SYS;
+	QDF_MODULE_ID targetMQ = QDF_MODULE_ID_SYS;
 
 	/*
 	 * The body of this pMsg is a tSirMbMsg
@@ -294,7 +294,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	case WNI_CFG_DNLD_REQ:
 	case WNI_CFG_DNLD_CNF:
 		/* Forward this message to the SYS module */
-		targetMQ = CDS_MQ_ID_SYS;
+		targetMQ = QDF_MODULE_ID_SYS;
 		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			"Handling for the Message ID %d is removed in SYS",
 			pMsg->type);
@@ -306,7 +306,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 		 */
 	case WNI_CFG_DNLD_RSP:
 		/* Forward this message to the HAL module */
-		targetMQ = CDS_MQ_ID_WMA;
+		targetMQ = QDF_MODULE_ID_WMA;
 		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			"Handling for the Message ID %d is removed as no HAL",
 			pMsg->type);
@@ -319,19 +319,19 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	case WNI_CFG_SET_REQ_NO_RSP:
 	case eWNI_SME_SYS_READY_IND:
 		/* Forward this message to the PE module */
-		targetMQ = CDS_MQ_ID_PE;
+		targetMQ = QDF_MODULE_ID_PE;
 		break;
 
 	case WNI_CFG_GET_RSP:
 	case WNI_CFG_SET_CNF:
 		/* Forward this message to the SME module */
-		targetMQ = CDS_MQ_ID_SME;
+		targetMQ = QDF_MODULE_ID_SME;
 		break;
 
 	default:
 		if ((pMsg->type >= eWNI_SME_MSG_TYPES_BEGIN)
 				&& (pMsg->type <= eWNI_SME_MSG_TYPES_END)) {
-			targetMQ = CDS_MQ_ID_SME;
+			targetMQ = QDF_MODULE_ID_SME;
 			break;
 		}
 
@@ -370,5 +370,5 @@ void wlan_sys_probe(void)
 	cds_message.reserved = SYS_MSG_COOKIE;
 	cds_message.type = SYS_MSG_ID_MC_THR_PROBE;
 	cds_message.bodyptr = NULL;
-	cds_mq_post_message(CDS_MQ_ID_SYS, &cds_message);
+	cds_mq_post_message(QDF_MODULE_ID_SYS, &cds_message);
 }

core/sme/src/common/sme_api.c

@@ -3411,7 +3411,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id,
 	msg.reserved = 0;
 	msg.bodyval = 0;
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+		cds_mq_post_message(QDF_MODULE_ID_SME, &msg)) {
 		sms_log(mac_ctx, LOGE,
 			" sme_scan_req failed to post msg");
 		csr_scan_free_request(mac_ctx, scan_msg->scan_param);
@@ -5404,7 +5404,8 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal,
 		cds_message.reserved = 0;
 
 		if (!QDF_IS_STATUS_SUCCESS
-			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) {
+			    (cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message))) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post LINK STATUS MSG fail", __func__);
 			qdf_mem_free(pMsg);
@@ -5561,7 +5562,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal,
 		msg.reserved = 0;
 
 		if (QDF_STATUS_SUCCESS !=
-		    cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+		    cds_mq_post_message(QDF_MODULE_ID_SME, &msg)) {
 			sms_log(pMac, LOGE,
 				" sme_change_country_code failed to post msg to self ");
 			qdf_mem_free((void *)pMsg);
@@ -5629,7 +5630,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
 		msg.reserved = 0;
 
 		if (QDF_STATUS_SUCCESS !=
-		    cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+		    cds_mq_post_message(QDF_MODULE_ID_SME, &msg)) {
 			sms_log(pMac, LOGE,
 				"sme_generic_change_country_code failed to post msg to self");
 			qdf_mem_free(pMsg);
@@ -5704,7 +5705,8 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal,
 		cds_message.reserved = 0;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 sessionId, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post DHCP Start MSG fail", __func__);
@@ -5777,7 +5779,8 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
 		cds_message.reserved = 0;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 sessionId, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post DHCP Stop MSG fail", __func__);
@@ -5831,7 +5834,8 @@ QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, uint8_t tx_fail_c
 		cds_message.bodyptr = pMsg;
 		cds_message.reserved = 0;
 
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post TX Fail monitor Start MSG fail",
@@ -6880,7 +6884,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id,
 	msg.reserved = 0;
 	msg.bodyval = 0;
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+		cds_mq_post_message(QDF_MODULE_ID_SME, &msg)) {
 		sms_log(mac_ctx, LOGE,
 			" sme_scan_req failed to post msg");
 		qdf_mem_free(roc_msg);
@@ -7072,7 +7076,8 @@ QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal,
 		cds_message.type = WMA_CFG_RXP_FILTER_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -7126,7 +7131,8 @@ QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal,
 		cds_message.type = WMA_WLAN_SUSPEND_IND;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			pMac->readyToSuspendCallback = NULL;
 			pMac->readyToSuspendContext = NULL;
@@ -7173,7 +7179,8 @@ QDF_STATUS sme_configure_resume_req(tHalHandle hHal,
 		cds_message.type = WMA_WLAN_RESUME_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -7220,7 +7227,8 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal,
 		qdf_mem_copy(MsgPtr, wlanExtParams, sizeof(*MsgPtr));
 		cds_message.bodyptr = MsgPtr;
 		cds_message.type = WMA_WLAN_EXT_WOW;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			pMac->readyToExtWoWCallback = NULL;
 			pMac->readyToExtWoWContext = NULL;
@@ -7275,7 +7283,8 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal,
 		qdf_mem_copy(MsgPtr, wlanAppType1Params, sizeof(*MsgPtr));
 		cds_message.bodyptr = MsgPtr;
 		cds_message.type = WMA_WLAN_SET_APP_TYPE1_PARAMS;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			qdf_mem_free(MsgPtr);
 			status = QDF_STATUS_E_FAILURE;
@@ -7326,7 +7335,8 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal,
 		qdf_mem_copy(MsgPtr, wlanAppType2Params, sizeof(*MsgPtr));
 		cds_message.bodyptr = MsgPtr;
 		cds_message.type = WMA_WLAN_SET_APP_TYPE2_PARAMS;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			qdf_mem_free(MsgPtr);
 			status = QDF_STATUS_E_FAILURE;
@@ -7639,7 +7649,7 @@ QDF_STATUS sme_set_tsf_gpio(tHalHandle h_hal, uint32_t pinvalue)
 		tsf_msg.reserved = 0;
 		tsf_msg.bodyval = pinvalue;
 
-		status = cds_mq_post_message(CDS_MQ_ID_WMA, &tsf_msg);
+		status = cds_mq_post_message(QDF_MODULE_ID_WMA, &tsf_msg);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			sms_log(mac, LOGE, "Unable to post WMA_TSF_GPIO_PIN");
 			status = QDF_STATUS_E_FAILURE;
@@ -7985,7 +7995,8 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 	msg.bodyptr = request_buf;
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 sessionId, msg.type));
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to "
 			  "post WMA_8023_MULTICAST_LIST message to WMA",
@@ -8082,7 +8093,8 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 
 	}
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post "
 			  "WMA_RECEIVE_FILTER_SET_FILTER message to WMA",
@@ -8133,7 +8145,8 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal,
 	msg.bodyptr = request_buf;
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 sessionId, msg.type));
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post "
 			  "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA",
@@ -8250,7 +8263,8 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB)
 	msg.bodyptr = pMaxTxPowerPerBandParams;
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 NO_SESSION, msg.type));
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ",
 			  __func__);
@@ -8299,7 +8313,8 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid,
 	msg.reserved = 0;
 	msg.bodyptr = pMaxTxParams;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA",
 			  __func__);
@@ -8338,7 +8353,8 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr)
 	msg.reserved = 0;
 	msg.bodyptr = pBaseMacAddr;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA"));
@@ -8392,7 +8408,8 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 	msg.reserved = 0;
 	msg.bodyptr = pTxParams;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to post WMA_SET_TX_POWER_REQ to WMA",
 			  __func__);
@@ -8482,7 +8499,8 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod
 		cds_message.type = WMA_SET_TM_LEVEL_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Set TM Level MSG fail", __func__);
@@ -10432,7 +10450,7 @@ QDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams,
 	/* serialize the req through MC thread */
 	cds_message.bodyptr = psmeTdlsParams;
 	cds_message.type = WMA_UPDATE_FW_TDLS_STATE;
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 		status = QDF_STATUS_E_FAILURE;
 
@@ -10572,7 +10590,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal,
 	cds_message.reserved = 0;
 	cds_message.bodyptr = pTdlsPeerStateParams;
 
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("cds_mq_post_message failed "));
@@ -10658,7 +10676,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 	cds_message.reserved = 0;
 	cds_message.bodyptr = chan_switch_params;
 
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Message Post failed status=%d"),
@@ -10698,7 +10716,8 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq,
 		/* serialize the req through MC thread */
 		cds_message.bodyptr = lsReq;
 		cds_message.type = WMA_GET_LINK_SPEED;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Link Speed msg fail", __func__);
@@ -10830,7 +10849,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id,
 		msg.reserved = 0;
 		msg.bodyptr  = request_buf;
 		if (!QDF_IS_STATUS_SUCCESS(
-				cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) {
+				cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Not able to post WMA_IPA_OFFLOAD_ENABLE_DISABLE message to WMA"));
 			qdf_mem_free(request_buf);
@@ -10898,7 +10917,8 @@ QDF_STATUS sme_lphb_config_req
 		cds_message.type = WMA_LPHB_CONF_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Config LPHB MSG fail", __func__);
@@ -11056,7 +11076,8 @@ QDF_STATUS sme_enable_rmc(tHalHandle hHal, uint32_t sessionId)
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		cds_message.bodyptr = NULL;
 		cds_message.type = WMA_RMC_ENABLE_IND;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: failed to post message to WMA",
@@ -11087,7 +11108,8 @@ QDF_STATUS sme_disable_rmc(tHalHandle hHal, uint32_t sessionId)
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		cds_message.bodyptr = NULL;
 		cds_message.type = WMA_RMC_DISABLE_IND;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: failed to post message to WMA",
@@ -11117,7 +11139,8 @@ QDF_STATUS sme_send_rmc_action_period(tHalHandle hHal, uint32_t sessionId)
 	if (QDF_STATUS_SUCCESS == status) {
 		cds_message.bodyptr = NULL;
 		cds_message.type = WMA_RMC_ACTION_PERIOD_IND;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: failed to post message to WMA",
@@ -11171,7 +11194,8 @@ QDF_STATUS sme_request_ibss_peer_info(tHalHandle hHal, void *pUserData,
 		cds_message.bodyptr = pIbssInfoReqParams;
 		cds_message.reserved = 0;
 
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post WMA_GET_IBSS_PEER_INFO_REQ MSG failed",
@@ -11203,7 +11227,8 @@ QDF_STATUS sme_send_cesium_enable_ind(tHalHandle hHal, uint32_t sessionId)
 	if (QDF_STATUS_SUCCESS == status) {
 		cds_message.bodyptr = NULL;
 		cds_message.type = WMA_IBSS_CESIUM_ENABLE_IND;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: failed to post message to WMA",
@@ -12534,7 +12559,8 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val)
 		/* serialize the req through MC thread */
 		cds_message.bodyptr = auto_sh_cmd;
 		cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Auto shutdown MSG fail", __func__);
@@ -12612,7 +12638,8 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal)
 		/* serialize the req through MC thread */
 		cds_message.bodyptr = cauReq;
 		cds_message.type = WMA_CH_AVOID_UPDATE_REQ;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Ch Avoid Update MSG fail",
@@ -12997,7 +13024,8 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx)
 		cds_message.reserved = 0;
 		cds_message.bodyptr = tx_power_limit;
 
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_TX_POWER_LIMIT",
@@ -13058,7 +13086,8 @@ QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId,
 		/* serialize the req through MC thread */
 		cds_message.bodyptr = pSapDisableIntraFwd;
 		cds_message.type = WMA_SET_SAP_INTRABSS_DIS;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			status = QDF_STATUS_E_FAILURE;
 			qdf_mem_free(pSapDisableIntraFwd);
@@ -13145,7 +13174,8 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input)
 	msg.reserved = 0;
 	msg.bodyptr = data;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA",
 			  __func__);
@@ -13563,7 +13593,8 @@ QDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_GET_CAPABILITIES_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13594,7 +13625,8 @@ QDF_STATUS sme_ext_scan_start(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_START_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13624,7 +13656,8 @@ QDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq
 		cds_message.type = WMA_EXTSCAN_STOP_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 		sme_release_global_lock(&pMac->sme);
@@ -13655,7 +13688,8 @@ QDF_STATUS sme_set_bss_hotlist(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13687,7 +13721,8 @@ QDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13723,7 +13758,7 @@ QDF_STATUS sme_set_wisa_params(tHalHandle hal,
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		cds_message.bodyptr = cds_msg_wisa_params;
 		cds_message.type = WMA_SET_WISA_PARAMS;
-		status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 		sme_release_global_lock(&mac->sme);
 	}
 	return status;
@@ -13752,7 +13787,8 @@ QDF_STATUS sme_set_significant_change(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13784,7 +13820,8 @@ QDF_STATUS sme_reset_significant_change(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13816,7 +13853,8 @@ QDF_STATUS sme_get_cached_results(tHalHandle hHal,
 		cds_message.type = WMA_EXTSCAN_GET_CACHED_RESULTS_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 
@@ -13893,7 +13931,7 @@ QDF_STATUS sme_set_epno_list(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = WMA_SET_EPNO_LIST_REQ;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -13962,7 +14000,7 @@ QDF_STATUS sme_set_passpoint_list(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = WMA_SET_PASSPOINT_LIST_REQ;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -14011,7 +14049,7 @@ QDF_STATUS sme_reset_passpoint_list(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = WMA_RESET_PASSPOINT_LIST_REQ;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -14051,7 +14089,7 @@ sme_set_ssid_hotlist(tHalHandle hal,
 		/* Serialize the req through MC thread */
 		cds_message.bodyptr = set_req;
 		cds_message.type    = WMA_EXTSCAN_SET_SSID_HOTLIST_REQ;
-		status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 		sme_release_global_lock(&mac->sme);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			qdf_mem_free(set_req);
@@ -14127,7 +14165,8 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal,
 		cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_CLEAR_REQ",
@@ -14185,7 +14224,8 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq
 		cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_SET_REQ",
@@ -14236,7 +14276,8 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq
 		cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ;
 		MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 				 NO_SESSION, cds_message.type));
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_GET_REQ",
@@ -14496,7 +14537,8 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal,
 		/* serialize the req through MC thread */
 		cds_message.bodyptr = NULL;
 		cds_message.type = WMA_GET_TEMPERATURE_REQ;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Post Get Temperature msg fail"));
@@ -14526,7 +14568,8 @@ QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui
 		/* Serialize the req through MC thread */
 		cds_message.bodyptr = pScanMacOui;
 		cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Msg post Set Scan Mac OUI failed"));
@@ -14571,7 +14614,8 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal,
 		cds_message.bodyptr = pSmeDhcpSrvInfo;
 
 		if (!QDF_IS_STATUS_SUCCESS
-			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) {
+			    (cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message))) {
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!",
 				  __func__);
@@ -14623,7 +14667,8 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type,
 		/* Serialize the req through MC thread */
 		cds_message.bodyptr = ledflashing;
 		cds_message.type = WMA_LED_FLASHING_REQ;
-		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA,
+						 &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			status = QDF_STATUS_E_FAILURE;
 		sme_release_global_lock(&pMac->sme);
@@ -14917,7 +14962,7 @@ QDF_STATUS sme_wifi_start_logger(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = SIR_HAL_START_STOP_LOGGING;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -14972,7 +15017,7 @@ QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac)
 	/* Serialize the req through MC thread */
 	message.bodyptr = NULL;
 	message.type    = SIR_HAL_FLUSH_LOG_TO_FW;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -15289,7 +15334,7 @@ QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = WMA_SET_RSSI_MONITOR_REQ;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 			FL("cds_mq_post_message failed!(err=%d)"),
@@ -15422,7 +15467,7 @@ QDF_STATUS sme_pdev_set_pcl(tHalHandle hal,
 	/* Serialize the req through MC thread */
 	cds_message.bodyptr = req_msg;
 	cds_message.type    = SIR_HAL_PDEV_SET_PCL_TO_FW;
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac, LOGE,
 				FL("cds_mq_post_message failed!(err=%d)"),
@@ -15618,7 +15663,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal,
 	cds_message.type = WMA_GW_PARAM_UPDATE_REQ;
 	cds_message.reserved = 0;
 	cds_message.bodyptr = request_buf;
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL"));

core/sme/src/common/sme_power_save.c

@@ -974,7 +974,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 {
 	QDF_STATUS qdf_status;
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_PE, (cds_msg_t *) msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		sms_log(mac_ctx, LOGP,
 			FL("cds_mq_post_message failed with status code %d"),

core/sme/src/csr/csr_api_roam.c

@@ -868,7 +868,8 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 	pChanList->numChan = num_channel;
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 NO_SESSION, msg.type));
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to post msg to WMA", __func__);
 		qdf_mem_free(pChanList);
@@ -16523,7 +16524,8 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac,
 	msg.type = eWNI_SME_GET_RSSI_REQ;
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+						      &msg)) {
 		sms_log(pMac, LOGE, " csr_get_rssi failed to post msg to self ");
 		qdf_mem_free((void *)pMsg);
 		status = QDF_STATUS_E_FAILURE;
@@ -16563,7 +16565,8 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac,
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+						      &msg)) {
 		sms_log(pMac, LOGE, "%s failed to post msg to self", __func__);
 		qdf_mem_free((void *)pMsg);
 		status = QDF_STATUS_E_FAILURE;
@@ -18508,7 +18511,8 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac,
 	msg.type = eWNI_SME_HANDOFF_REQ;
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+						      &msg)) {
 		sms_log(pMac, LOGE,
 			" csr_handoff_request failed to post msg to self ");
 		qdf_mem_free((void *)pMsg);

core/sme/src/nan/nan_api.c

@@ -118,7 +118,8 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input)
 	msg.reserved = 0;
 	msg.bodyptr = data;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Not able to post WMA_NAN_REQUEST message to WMA"));

core/utils/pktlog/pktlog_ac.c

@@ -95,7 +95,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types,
 	msg.bodyptr = param;
 	msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_WMA, &msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 
 	if (status != QDF_STATUS_SUCCESS) {
 		qdf_mem_free(param);

core/wma/src/wlan_qct_wma_legacy.c

@@ -57,7 +57,7 @@
 tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 {
 	if (QDF_STATUS_SUCCESS !=
-	    cds_mq_post_message(CDS_MQ_ID_WMA, (cds_msg_t *) pMsg))
+	    cds_mq_post_message(QDF_MODULE_ID_WMA, (cds_msg_t *) pMsg))
 		return eSIR_FAILURE;
 	else
 		return eSIR_SUCCESS;

core/wma/src/wma_data.c

@@ -2211,7 +2211,7 @@ send_response:
 	cds_msg.bodyval = 0;
 
 	if (QDF_STATUS_SUCCESS !=
-	    cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) {
+	    cds_mq_post_message(QDF_MODULE_ID_SME, (cds_msg_t *) &cds_msg)) {
 		WMA_LOGE("%s: could not post peer info rsp msg to SME",
 			 __func__);
 		/* free the mem and return */
@@ -3014,7 +3014,8 @@ void ol_rx_err(void *pdev, uint8_t vdev_id,
 	cds_msg.bodyptr = (void *) mic_err_ind;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) {
+		cds_mq_post_message(QDF_MODULE_ID_SME,
+				    (cds_msg_t *) &cds_msg)) {
 		WMA_LOGE("%s: could not post mic failure indication to SME",
 			 __func__);
 		qdf_mem_free((void *)mic_err_ind);
@@ -3166,7 +3167,7 @@ wma_indicate_err(
 		cds_msg.type = eWNI_SME_MIC_FAILURE_IND;
 		cds_msg.bodyptr = (void *) mic_err_ind;
 		if (QDF_STATUS_SUCCESS !=
-			cds_mq_post_message(CDS_MQ_ID_SME,
+			cds_mq_post_message(QDF_MODULE_ID_SME,
 				 (cds_msg_t *) &cds_msg)) {
 			WMA_LOGE("%s: mic failure ind post to SME failed",
 					 __func__);

core/wma/src/wma_features.c

@@ -318,7 +318,7 @@ int wma_vdev_tsf_handler(void *handle, uint8_t *data, uint32_t data_len)
 	tsf_msg.bodyval = 0;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(CDS_MQ_ID_SME, &tsf_msg)) {
+		cds_mq_post_message(QDF_MODULE_ID_SME, &tsf_msg)) {
 
 		WMA_LOGP("%s: Failed to post eWNI_SME_TSF_EVENT", __func__);
 		qdf_mem_free(ptsf);
@@ -1518,7 +1518,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
 	cds_msg.bodyptr = (void *)nan_rsp_event;
 	cds_msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Failed to post NaN response event to SME",
 			 __func__);
@@ -2263,7 +2263,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended)
 	cds_msg.bodyptr = (void *)ready_to_suspend;
 	cds_msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post ready to suspend");
 		qdf_mem_free(ready_to_suspend);
@@ -5207,7 +5207,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event,
 	cds_msg.bodyptr = (void *)resp;
 	cds_msg.bodyval = 0;
 
-	if (cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)
+	if (cds_mq_post_message(QDF_MODULE_ID_SME, (cds_msg_t *) &cds_msg)
 	    != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post GTK response to SME");
 		qdf_mem_free(resp);
@@ -5954,7 +5954,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status)
 	cds_msg.bodyptr = (void *)ready_to_extwow;
 	cds_msg.bodyval = 0;
 
-	vstatus = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg);
+	vstatus = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
 	if (vstatus != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post ready to suspend");
 		qdf_mem_free(ready_to_extwow);

core/wma/src/wma_main.c

@@ -1588,7 +1588,7 @@ static int wma_process_fw_event_mc_thread_ctx(void *ctx, void *ev)
 	cds_msg.bodyval = 0;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(CDS_MQ_ID_WMA, &cds_msg)) {
+		cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_msg)) {
 		WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg",
 			 __func__);
 		qdf_nbuf_free(ev);
@@ -2446,7 +2446,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx)
 	wma_msg.bodyptr = NULL;
 	wma_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg);
+	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &wma_msg);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		WMA_LOGP("%s: Failed to post WNI_CFG_DNLD_REQ msg", __func__);
 		QDF_ASSERT(0);

core/wma/src/wma_scan_roam.c

@@ -1891,7 +1891,7 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
 			 * SME with proper reason code.
 			 */
 			if (QDF_STATUS_SUCCESS !=
-			    cds_mq_post_message(CDS_MQ_ID_SME,
+			    cds_mq_post_message(QDF_MODULE_ID_SME,
 						(cds_msg_t *) &cds_msg)) {
 				qdf_mem_free(scan_offload_rsp);
 				QDF_TRACE(QDF_MODULE_ID_WMA,
@@ -3326,7 +3326,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId)
 	cds_msg.bodyptr = (void *)nw_found_ind;
 	cds_msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Failed to post PNO completion match event to SME",
 			 __func__);
@@ -5770,7 +5770,7 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id)
 	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO,
 		  FL("posting candidate ind to SME"));
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME,
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
 						(cds_msg_t *) &cds_msg)) {
 		qdf_mem_free(candidate_ind);
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,

core/wma/src/wma_utils.c

@@ -471,7 +471,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
 	cds_msg.bodyptr = (void *)stats_ext_event;
 	cds_msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Failed to post stats ext event to SME", __func__);
 		qdf_mem_free(stats_ext_event);
@@ -2556,7 +2556,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle)
 	msg.bodyptr = payload;
 	msg.bodyval = 0;
 
-	status = cds_mq_post_message(CDS_MQ_ID_SYS, &msg);
+	status = cds_mq_post_message(QDF_MODULE_ID_SYS, &msg);
 
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("failed to post ftm response to SYS");