Răsfoiți Sursa

qcacld-3.0: Remove obsolete CDS mq APIs reference from WMA module

After control path scheduler componentization CDS message queue
APIs are no longer used hence replace CDS mq APIs in WMA module
by scheduler mq APIs.

Change-Id: I57e878480eff8998a307bbacf3e480b8b77b9f3a
CRs-Fixed: 1114371
Rajeev Kumar 8 ani în urmă
părinte
comite
b60abe47ab

+ 2 - 1
core/mac/src/pe/nan/nan_datapath.c

@@ -460,7 +460,8 @@ skip_event:
  *
  * Return: QDF_STATUS_SUCCESS on success; error number otherwise
  */
-QDF_STATUS lim_handle_ndp_event_message(tpAniSirGlobal mac_ctx, cds_msg_t *msg)
+QDF_STATUS lim_handle_ndp_event_message(tpAniSirGlobal mac_ctx,
+					struct scheduler_msg *msg)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 

+ 4 - 3
core/mac/src/pe/nan/nan_datapath.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -104,7 +104,8 @@ struct ndp_peer_node {
 QDF_STATUS lim_handle_ndp_request_message(tpAniSirGlobal mac_ctx,
 					tpSirMsgQ msg);
 /* Function to process NDP events */
-QDF_STATUS lim_handle_ndp_event_message(tpAniSirGlobal mac_ctx, cds_msg_t *msg);
+QDF_STATUS lim_handle_ndp_event_message(tpAniSirGlobal mac_ctx,
+					struct scheduler_msg *msg);
 void lim_process_ndi_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 				     tpSirMsgQ lim_msg_q,
 				     tpPESession session_entry);
@@ -129,7 +130,7 @@ static inline QDF_STATUS lim_handle_ndp_request_message(tpAniSirGlobal mac_ctx,
 
 /* Function to process NDP events */
 static inline QDF_STATUS lim_handle_ndp_event_message(tpAniSirGlobal mac_ctx,
-						      cds_msg_t *msg)
+						      struct scheduler_msg *msg)
 {
 	return QDF_STATUS_SUCCESS;
 }

+ 3 - 2
core/mac/src/sys/common/inc/wlan_qct_sys.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -103,7 +103,8 @@ typedef void (*sysResponseCback)(void *pUserData);
    \sa
 
    --------------------------------------------------------------------------*/
-QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg);
+QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId,
+				    struct scheduler_msg *pMsg);
 
 /*----------------------------------------------------------------------------
 

+ 4 - 3
core/mac/src/sys/common/src/wlan_qct_sys.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -50,7 +50,8 @@ static qdf_event_t g_stop_evt;
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg)
+QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId,
+				    struct scheduler_msg *pMsg)
 {
 	pMsg->type = sysMsgId;
 	pMsg->reserved = SYS_MSG_COOKIE;
@@ -93,7 +94,7 @@ static void sys_stop_complete_cb(void *pUserData)
 QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	cds_msg_t sysMsg;
+	struct scheduler_msg sysMsg;
 
 	/* Initialize the stop event */
 	qdf_status = qdf_event_create(&g_stop_evt);

+ 1 - 1
core/wma/inc/wma.h

@@ -1591,7 +1591,7 @@ typedef struct {
 	/* NAN datapath support enabled in firmware */
 	bool nan_datapath_enabled;
 	QDF_STATUS (*pe_ndp_event_handler)(tpAniSirGlobal mac_ctx,
-					   cds_msg_t *msg);
+					   struct scheduler_msg *msg);
 	bool fw_timeout_crash;
 	bool sub_20_support;
 	tp_wma_packetdump_cb wma_mgmt_tx_packetdump_cb;

+ 3 - 3
core/wma/inc/wma_api.h

@@ -96,7 +96,7 @@ typedef void (*wma_peer_authorized_fp) (uint32_t vdev_id);
 
 QDF_STATUS wma_pre_start(void *cds_context);
 
-QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg);
+QDF_STATUS wma_mc_process_msg(void *cds_context, struct scheduler_msg *msg);
 
 QDF_STATUS wma_mc_process_handler(struct scheduler_msg *msg);
 
@@ -279,11 +279,11 @@ QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value);
 #ifdef WLAN_FEATURE_NAN_DATAPATH
 QDF_STATUS wma_register_ndp_cb(QDF_STATUS (*pe_ndp_event_handler)
 					  (tpAniSirGlobal mac_ctx,
-					  cds_msg_t *msg));
+					  struct scheduler_msg *msg));
 #else
 static inline QDF_STATUS wma_register_ndp_cb(QDF_STATUS (*pe_ndp_event_handler)
 							(tpAniSirGlobal mac_ctx,
-							cds_msg_t *msg))
+						struct scheduler_msg *msg))
 {
 	return QDF_STATUS_SUCCESS;
 }

+ 2 - 2
core/wma/src/wlan_qct_wma_legacy.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -57,7 +57,7 @@
 tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 {
 	if (QDF_STATUS_SUCCESS !=
-	    cds_mq_post_message(QDF_MODULE_ID_WMA, (cds_msg_t *) pMsg))
+	    scheduler_post_msg(QDF_MODULE_ID_WMA, (struct scheduler_msg *) pMsg))
 		return eSIR_FAILURE;
 	else
 		return eSIR_SUCCESS;

+ 12 - 12
core/wma/src/wma_data.c

@@ -1904,7 +1904,7 @@ QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma,
 static void wma_set_thermal_level_ind(u_int8_t level)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = {0};
+	struct scheduler_msg sme_msg = {0};
 
 	WMA_LOGI(FL("Thermal level: %d"), level);
 
@@ -1912,7 +1912,7 @@ static void wma_set_thermal_level_ind(u_int8_t level)
 	sme_msg.bodyptr = NULL;
 	sme_msg.bodyval = level;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 		WMA_LOGE(FL(
 			"Fail to post set thermal level ind msg"));
@@ -2141,7 +2141,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event,
 int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data,
 					    uint32_t len)
 {
-	cds_msg_t cds_msg;
+	struct scheduler_msg cds_msg;
 	wmi_peer_info *peer_info;
 	void *pdev;
 	tSirIbssPeerInfoParams *pSmeRsp;
@@ -2216,7 +2216,7 @@ send_response:
 	cds_msg.bodyval = 0;
 
 	if (QDF_STATUS_SUCCESS !=
-	    cds_mq_post_message(QDF_MODULE_ID_SME, (cds_msg_t *) &cds_msg)) {
+	    scheduler_post_msg(QDF_MODULE_ID_SME, (struct scheduler_msg *) &cds_msg)) {
 		WMA_LOGE("%s: could not post peer info rsp msg to SME",
 			 __func__);
 		/* free the mem and return */
@@ -2998,7 +2998,7 @@ void ol_rx_err(void *pdev, uint8_t vdev_id,
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 	tpSirSmeMicFailureInd mic_err_ind;
 	struct ether_header *eth_hdr;
-	cds_msg_t cds_msg;
+	struct scheduler_msg cds_msg;
 
 	if (NULL == wma) {
 		WMA_LOGE("%s: Failed to get wma", __func__);
@@ -3037,13 +3037,13 @@ void ol_rx_err(void *pdev, uint8_t vdev_id,
 		IEEE80211_IS_MULTICAST(eth_hdr->ether_dhost);
 	qdf_mem_copy(mic_err_ind->info.TSC, pn, SIR_CIPHER_SEQ_CTR_SIZE);
 
-	qdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0);
+	qdf_mem_set(&cds_msg, sizeof(struct scheduler_msg), 0);
 	cds_msg.type = eWNI_SME_MIC_FAILURE_IND;
 	cds_msg.bodyptr = (void *) mic_err_ind;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(QDF_MODULE_ID_SME,
-				    (cds_msg_t *) &cds_msg)) {
+		scheduler_post_msg(QDF_MODULE_ID_SME,
+				    (struct scheduler_msg *) &cds_msg)) {
 		WMA_LOGE("%s: could not post mic failure indication to SME",
 			 __func__);
 		qdf_mem_free((void *)mic_err_ind);
@@ -3148,7 +3148,7 @@ wma_indicate_err(
 	{
 		tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 		tpSirSmeMicFailureInd mic_err_ind;
-		cds_msg_t cds_msg;
+		struct scheduler_msg cds_msg;
 		uint8_t vdev_id;
 
 		if (NULL == wma) {
@@ -3191,12 +3191,12 @@ wma_indicate_err(
 			 (void *)&err_info->
 			 u.mic_err.pn, SIR_CIPHER_SEQ_CTR_SIZE);
 
-		qdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0);
+		qdf_mem_set(&cds_msg, sizeof(struct scheduler_msg), 0);
 		cds_msg.type = eWNI_SME_MIC_FAILURE_IND;
 		cds_msg.bodyptr = (void *) mic_err_ind;
 		if (QDF_STATUS_SUCCESS !=
-			cds_mq_post_message(QDF_MODULE_ID_SME,
-				 (cds_msg_t *) &cds_msg)) {
+			scheduler_post_msg(QDF_MODULE_ID_SME,
+				 (struct scheduler_msg *) &cds_msg)) {
 			WMA_LOGE("%s: mic failure ind post to SME failed",
 					 __func__);
 			qdf_mem_free((void *)mic_err_ind);

+ 8 - 8
core/wma/src/wma_dev_if.c

@@ -413,7 +413,7 @@ static void wma_vdev_detach_callback(void *ctx)
 	struct del_sta_self_params *param;
 	struct wma_target_req *req_msg;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 
 	wma = cds_get_context(QDF_MODULE_ID_WMA);
 
@@ -450,7 +450,7 @@ static void wma_vdev_detach_callback(void *ctx)
 	sme_msg.bodyptr = param;
 	sme_msg.bodyval = 0;
 
-	status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP");
 		qdf_mem_free(param);
@@ -534,7 +534,7 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle,
 	uint8_t vdev_id = del_sta_self_req_param->session_id;
 	struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id];
 	struct wma_target_req *msg = NULL;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 
 	if (!soc) {
@@ -605,7 +605,7 @@ out:
 		sme_msg.bodyptr = del_sta_self_req_param;
 		sme_msg.bodyval = 0;
 
-		status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+		status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP");
 			qdf_mem_free(del_sta_self_req_param);
@@ -1578,7 +1578,7 @@ void *wma_vdev_attach(tp_wma_handle wma_handle,
 	uint16_t val16;
 	QDF_STATUS ret;
 	tSirMacHTCapabilityInfo *phtCapInfo;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	struct vdev_create_params params = { 0 };
 	u_int8_t vdev_id;
 	struct sir_set_tx_rx_aggregation_size tx_rx_aggregation_size;
@@ -1826,7 +1826,7 @@ end:
 		sme_msg.bodyptr = self_sta_req;
 		sme_msg.bodyval = 0;
 
-		status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+		status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP");
 			qdf_mem_free(self_sta_req);
@@ -2460,7 +2460,7 @@ void wma_vdev_resp_timer(void *data)
 	uint8_t peer_id;
 	struct wma_target_req *msg;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
 	tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE);
@@ -2622,7 +2622,7 @@ void wma_vdev_resp_timer(void *data)
 			sme_msg.bodyptr = iface->del_staself_req;
 			sme_msg.bodyval = 0;
 
-			status = cds_mq_post_message(QDF_MODULE_ID_SME,
+			status = scheduler_post_msg(QDF_MODULE_ID_SME,
 						     &sme_msg);
 			if (!QDF_IS_STATUS_SUCCESS(status)) {
 				WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP");

+ 36 - 36
core/wma/src/wma_features.c

@@ -121,7 +121,7 @@ static int wma_post_auto_shutdown_msg(void)
 {
 	tSirAutoShutdownEvtParams *auto_sh_evt;
 	QDF_STATUS qdf_status;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 
 	auto_sh_evt = (tSirAutoShutdownEvtParams *)
 		      qdf_mem_malloc(sizeof(tSirAutoShutdownEvtParams));
@@ -136,7 +136,7 @@ static int wma_post_auto_shutdown_msg(void)
 	sme_msg.bodyptr = auto_sh_evt;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME");
 		qdf_mem_free(auto_sh_evt);
@@ -285,7 +285,7 @@ end:
  */
 int wma_vdev_tsf_handler(void *handle, uint8_t *data, uint32_t data_len)
 {
-	cds_msg_t tsf_msg = {0};
+	struct scheduler_msg tsf_msg = {0};
 	WMI_VDEV_TSF_REPORT_EVENTID_param_tlvs *param_buf;
 	wmi_vdev_tsf_report_event_fixed_param *tsf_event;
 	struct stsf *ptsf;
@@ -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(QDF_MODULE_ID_SME, &tsf_msg)) {
+		scheduler_post_msg(QDF_MODULE_ID_SME, &tsf_msg)) {
 
 		WMA_LOGP("%s: Failed to post eWNI_SME_TSF_EVENT", __func__);
 		qdf_mem_free(ptsf);
@@ -1355,7 +1355,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event)
 	wmi_hb_ind_event_fixed_param *hb_fp;
 	tSirLPHBInd *slphb_indication;
 	QDF_STATUS qdf_status;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 
 	hb_fp = (wmi_hb_ind_event_fixed_param *) event;
 	if (!hb_fp) {
@@ -1381,7 +1381,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event)
 	sme_msg.bodyptr = slphb_indication;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME");
 		qdf_mem_free(slphb_indication);
@@ -1478,7 +1478,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
 	tSirNanEvent *nan_rsp_event;
 	wmi_nan_event_hdr *nan_rsp_event_hdr;
 	QDF_STATUS status;
-	cds_msg_t cds_msg;
+	struct scheduler_msg message;
 	uint8_t *buf_ptr;
 	uint32_t alloc_len;
 
@@ -1514,11 +1514,11 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
 	qdf_mem_copy(nan_rsp_event->event_data, buf_ptr +
 		     sizeof(wmi_nan_event_hdr) + WMI_TLV_HDR_SIZE,
 		     nan_rsp_event->event_data_len);
-	cds_msg.type = eWNI_SME_NAN_EVENT;
-	cds_msg.bodyptr = (void *)nan_rsp_event;
-	cds_msg.bodyval = 0;
+	message.type = eWNI_SME_NAN_EVENT;
+	message.bodyptr = (void *)nan_rsp_event;
+	message.bodyval = 0;
 
-	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_SME, &message);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Failed to post NaN response event to SME",
 			 __func__);
@@ -2242,7 +2242,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended)
 {
 	tSirReadyToSuspendInd *ready_to_suspend;
 	QDF_STATUS status;
-	cds_msg_t cds_msg;
+	struct scheduler_msg message;
 	uint8_t len;
 
 	WMA_LOGD("Posting ready to suspend indication to umac");
@@ -2259,11 +2259,11 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended)
 	ready_to_suspend->mesgLen = len;
 	ready_to_suspend->suspended = suspended;
 
-	cds_msg.type = eWNI_SME_READY_TO_SUSPEND_IND;
-	cds_msg.bodyptr = (void *)ready_to_suspend;
-	cds_msg.bodyval = 0;
+	message.type = eWNI_SME_READY_TO_SUSPEND_IND;
+	message.bodyptr = (void *)ready_to_suspend;
+	message.bodyval = 0;
 
-	status = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_SME, &message);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post ready to suspend");
 		qdf_mem_free(ready_to_suspend);
@@ -5231,7 +5231,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event,
 	WMI_GTK_OFFLOAD_STATUS_EVENT_fixed_param *status;
 	WMI_GTK_OFFLOAD_STATUS_EVENTID_param_tlvs *param_buf;
 	tpSirGtkOffloadGetInfoRspParams resp;
-	cds_msg_t cds_msg;
+	struct scheduler_msg message;
 	uint8_t *bssid;
 
 	WMA_LOGD("%s Enter", __func__);
@@ -5277,11 +5277,11 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event,
 	resp->ulIGTKRekeyCount = status->refresh_cnt;
 #endif /* IGTK_OFFLOAD */
 
-	cds_msg.type = eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP;
-	cds_msg.bodyptr = (void *)resp;
-	cds_msg.bodyval = 0;
+	message.type = eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP;
+	message.bodyptr = (void *)resp;
+	message.bodyval = 0;
 
-	if (cds_mq_post_message(QDF_MODULE_ID_SME, (cds_msg_t *) &cds_msg)
+	if (scheduler_post_msg(QDF_MODULE_ID_SME, (struct scheduler_msg *) &message)
 	    != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post GTK response to SME");
 		qdf_mem_free(resp);
@@ -6007,7 +6007,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status)
 {
 	tSirReadyToExtWoWInd *ready_to_extwow;
 	QDF_STATUS vstatus;
-	cds_msg_t cds_msg;
+	struct scheduler_msg message;
 	uint8_t len;
 
 	WMA_LOGD("Posting ready to suspend indication to umac");
@@ -6024,11 +6024,11 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status)
 	ready_to_extwow->mesgLen = len;
 	ready_to_extwow->status = status;
 
-	cds_msg.type = eWNI_SME_READY_TO_EXTWOW_IND;
-	cds_msg.bodyptr = (void *)ready_to_extwow;
-	cds_msg.bodyval = 0;
+	message.type = eWNI_SME_READY_TO_EXTWOW_IND;
+	message.bodyptr = (void *)ready_to_extwow;
+	message.bodyval = 0;
 
-	vstatus = cds_mq_post_message(QDF_MODULE_ID_SME, &cds_msg);
+	vstatus = scheduler_post_msg(QDF_MODULE_ID_SME, &message);
 	if (vstatus != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to post ready to suspend");
 		qdf_mem_free(ready_to_extwow);
@@ -6316,7 +6316,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event,
 	uint32_t num_freq_ranges, freq_range_idx;
 	tSirChAvoidIndType *sca_indication;
 	QDF_STATUS qdf_status;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *param_buf =
 		(WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *) event;
 
@@ -6372,7 +6372,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event,
 	sme_msg.bodyptr = sca_indication;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME");
 		qdf_mem_free(sca_indication);
@@ -6491,7 +6491,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
  */
 static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle)
 {
-	cds_msg_t resume_msg;
+	struct scheduler_msg resume_msg;
 	QDF_STATUS status;
 	tp_wma_handle wma = (tp_wma_handle) handle;
 
@@ -6500,7 +6500,7 @@ static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle)
 	resume_msg.bodyptr = NULL;
 	resume_msg.type    = WMA_RUNTIME_PM_RESUME_IND;
 
-	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &resume_msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &resume_msg);
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		WMA_LOGE("Failed to post Runtime PM Resume IND to VOS");
@@ -6521,15 +6521,15 @@ static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle)
  */
 static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle)
 {
-	cds_msg_t cds_msg;
+	struct scheduler_msg message;
 	QDF_STATUS qdf_status;
 	tp_wma_handle wma = (tp_wma_handle) handle;
 
 	qdf_event_reset(&wma->runtime_suspend);
 
-	cds_msg.bodyptr = NULL;
-	cds_msg.type    = WMA_RUNTIME_PM_SUSPEND_IND;
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_msg);
+	message.bodyptr = NULL;
+	message.type    = WMA_RUNTIME_PM_SUSPEND_IND;
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
 
 	if (qdf_status != QDF_STATUS_SUCCESS)
 		goto failure;
@@ -7782,7 +7782,7 @@ QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma,
 static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status)
 {
 	struct fw_dump_rsp *dump_rsp;
-	cds_msg_t sme_msg = {0};
+	struct scheduler_msg sme_msg = {0};
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 
 	dump_rsp = qdf_mem_malloc(sizeof(*dump_rsp));
@@ -7803,7 +7803,7 @@ static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status)
 	sme_msg.bodyptr = dump_rsp;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE(FL("Fail to post fw mem dump ind msg"));
 		qdf_mem_free(dump_rsp);

+ 10 - 10
core/wma/src/wma_main.c

@@ -515,7 +515,7 @@ int wma_cli_get_command(int vdev_id, int param_id, int vpdev)
 int wma_cli_set2_command(int vdev_id, int param_id, int sval1,
 			 int sval2, int vpdev)
 {
-	cds_msg_t msg = { 0 };
+	struct scheduler_msg msg = { 0 };
 	wma_cli_set_cmd_t *iwcmd;
 
 	iwcmd = qdf_mem_malloc(sizeof(*iwcmd));
@@ -535,7 +535,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1,
 	msg.bodyptr = iwcmd;
 
 	if (QDF_STATUS_SUCCESS !=
-	    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+	    scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 		WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg",
 			  __func__);
 		qdf_mem_free(iwcmd);
@@ -1549,7 +1549,7 @@ QDF_STATUS wma_process_hal_pwr_dbg_cmd(WMA_HANDLE handle,
 static int wma_process_fw_event_mc_thread_ctx(void *ctx, void *ev)
 {
 	wma_process_fw_event_params *params_buf;
-	cds_msg_t cds_msg = { 0 };
+	struct scheduler_msg cds_msg = { 0 };
 
 	params_buf = qdf_mem_malloc(sizeof(wma_process_fw_event_params));
 	if (!params_buf) {
@@ -1566,7 +1566,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(QDF_MODULE_ID_WMA, &cds_msg)) {
+		scheduler_post_msg(QDF_MODULE_ID_WMA, &cds_msg)) {
 		WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg",
 			 __func__);
 		qdf_nbuf_free(ev);
@@ -2366,7 +2366,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx)
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	A_STATUS status = A_OK;
 	tp_wma_handle wma_handle;
-	cds_msg_t wma_msg = { 0 };
+	struct scheduler_msg wma_msg = { 0 };
 
 	WMA_LOGD("%s: Enter", __func__);
 
@@ -2394,7 +2394,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx)
 	wma_msg.bodyptr = NULL;
 	wma_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &wma_msg);
+	qdf_status = scheduler_post_msg(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);
@@ -6204,7 +6204,7 @@ static QDF_STATUS wma_process_power_debug_stats_req(tp_wma_handle wma_handle)
  *
  * Return: QDF_SUCCESS for success otherwise failure
  */
-QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
+QDF_STATUS wma_mc_process_msg(void *cds_context, struct scheduler_msg *msg)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	tp_wma_handle wma_handle;
@@ -7060,7 +7060,7 @@ QDF_STATUS wma_mc_process_handler(struct scheduler_msg *msg)
 			"CDS context is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
-	return wma_mc_process_msg(cds_ctx, (cds_msg_t *)msg);
+	return wma_mc_process_msg(cds_ctx, (struct scheduler_msg *)msg);
 }
 
 /**
@@ -7376,7 +7376,7 @@ QDF_STATUS wma_crash_inject(tp_wma_handle wma_handle, uint32_t type,
  */
 int wma_lro_init(struct wma_lro_config_cmd_t *lro_config)
 {
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 	struct wma_lro_config_cmd_t *iwcmd;
 
 	iwcmd = qdf_mem_malloc(sizeof(*iwcmd));
@@ -7392,7 +7392,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config)
 	msg.bodyptr = iwcmd;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+		scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 		WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!");
 		qdf_mem_free(iwcmd);
 		return -EAGAIN;

+ 10 - 10
core/wma/src/wma_nan_datapath.c

@@ -52,7 +52,7 @@ QDF_STATUS wma_handle_ndp_initiator_req(tp_wma_handle wma_handle, void *req)
 	void *vdev;
 	wmi_buf_t buf;
 	wmi_ndp_initiator_req_fixed_param *cmd;
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	struct ndp_initiator_req *ndp_req = req;
 	wmi_channel *ch_tlv;
 	uint8_t *tlv_ptr;
@@ -199,7 +199,7 @@ QDF_STATUS wma_handle_ndp_responder_req(tp_wma_handle wma_handle,
 	wmi_ndp_responder_req_fixed_param *cmd;
 	uint16_t len;
 	struct ndp_responder_rsp_event rsp = {0};
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 
 	if (NULL == req_params) {
 		WMA_LOGE(FL("Invalid req_params."));
@@ -329,7 +329,7 @@ QDF_STATUS wma_handle_ndp_end_req(tp_wma_handle wma_handle, void *ptr)
 	uint32_t ndp_end_req_len, i;
 	wmi_ndp_end_req *ndp_end_req_lst;
 	wmi_buf_t buf;
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	wmi_ndp_end_req_fixed_param *cmd;
 	struct ndp_end_rsp_event end_rsp = {0};
 	struct ndp_end_req *req = ptr;
@@ -407,7 +407,7 @@ send_ndp_end_fail:
 static int wma_ndp_indication_event_handler(void *handle, uint8_t *event_info,
 					    uint32_t len)
 {
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	WMI_NDP_INDICATION_EVENTID_param_tlvs *event;
 	wmi_ndp_indication_event_fixed_param *fixed_params;
 	struct ndp_indication_event ind_event = {0};
@@ -510,7 +510,7 @@ static int wma_ndp_indication_event_handler(void *handle, uint8_t *event_info,
 static int wma_ndp_responder_rsp_event_handler(void *handle,
 					uint8_t *event_info, uint32_t len)
 {
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	tp_wma_handle wma_handle = handle;
 	WMI_NDP_RESPONDER_RSP_EVENTID_param_tlvs *event;
 	wmi_ndp_responder_rsp_event_fixed_param  *fixed_params;
@@ -551,7 +551,7 @@ static int wma_ndp_confirm_event_handler(void *handle, uint8_t *event_info,
 					 uint32_t len)
 {
 	struct ndp_confirm_event ndp_confirm = {0};
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 	WMI_NDP_CONFIRM_EVENTID_param_tlvs *event;
 	wmi_ndp_confirm_event_fixed_param *fixed_params;
 	tp_wma_handle wma_handle = handle;
@@ -614,7 +614,7 @@ static int wma_ndp_end_response_event_handler(void *handle,
 {
 	int ret = 0;
 	QDF_STATUS status;
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	struct ndp_end_rsp_event *end_rsp;
 	WMI_NDP_END_RSP_EVENTID_param_tlvs *event;
 	wmi_ndp_end_rsp_event_fixed_param *fixed_params = NULL;
@@ -666,7 +666,7 @@ static int wma_ndp_end_indication_event_handler(void *handle,
 	tp_wma_handle wma_handle = handle;
 	WMI_NDP_END_INDICATION_EVENTID_param_tlvs *event;
 	wmi_ndp_end_indication *ind;
-	cds_msg_t pe_msg;
+	struct scheduler_msg pe_msg;
 	struct ndp_end_indication_event *ndp_event_buf;
 	int i, ret, buf_size;
 	struct qdf_mac_addr peer_addr;
@@ -740,7 +740,7 @@ static int wma_ndp_end_indication_event_handler(void *handle,
 static int wma_ndp_initiator_rsp_event_handler(void *handle,
 					uint8_t *event_info, uint32_t len)
 {
-	cds_msg_t pe_msg = {0};
+	struct scheduler_msg pe_msg = {0};
 	WMI_NDP_INITIATOR_RSP_EVENTID_param_tlvs *event;
 	wmi_ndp_initiator_rsp_event_fixed_param  *fixed_params;
 	struct ndp_initiator_rsp ndp_rsp = {0};
@@ -1122,7 +1122,7 @@ void wma_delete_all_nan_remote_peers(tp_wma_handle wma, uint32_t vdev_id)
  * Return: Success or Failure Status
  */
 QDF_STATUS wma_register_ndp_cb(QDF_STATUS (*pe_ndp_event_handler)
-				(tpAniSirGlobal mac_ctx, cds_msg_t *msg))
+				(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg))
 {
 
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);

+ 11 - 11
core/wma/src/wma_ocb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -45,7 +45,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status)
 {
 	QDF_STATUS qdf_status;
 	struct sir_ocb_set_config_response *resp;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 	struct sir_ocb_config *req = wma_handle->ocb_config_req;
 	void *vdev = (req ?
 		wma_handle->interfaces[req->session_id].handle : NULL);
@@ -100,7 +100,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status)
 	msg.type = eWNI_SME_OCB_SET_CONFIG_RSP;
 	msg.bodyptr = resp;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE(FL("Fail to post msg to SME"));
 		qdf_mem_free(resp);
@@ -426,7 +426,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf,
 	struct sir_ocb_get_tsf_timer_response *response;
 	WMI_OCB_GET_TSF_TIMER_RESP_EVENTID_param_tlvs *param_tlvs;
 	wmi_ocb_get_tsf_timer_resp_event_fixed_param *fix_param;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 
 	param_tlvs = (WMI_OCB_GET_TSF_TIMER_RESP_EVENTID_param_tlvs *)event_buf;
 	fix_param = param_tlvs->fixed_param;
@@ -442,7 +442,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf,
 	msg.type = eWNI_SME_OCB_GET_TSF_TIMER_RSP;
 	msg.bodyptr = response;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE(FL("Failed to post msg to SME"));
 		qdf_mem_free(response);
@@ -496,7 +496,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf,
 	struct sir_dcc_get_stats_response *response;
 	WMI_DCC_GET_STATS_RESP_EVENTID_param_tlvs *param_tlvs;
 	wmi_dcc_get_stats_resp_event_fixed_param *fix_param;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 
 	param_tlvs = (WMI_DCC_GET_STATS_RESP_EVENTID_param_tlvs *)event_buf;
 	fix_param = param_tlvs->fixed_param;
@@ -519,7 +519,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf,
 	msg.type = eWNI_SME_DCC_GET_STATS_RSP;
 	msg.bodyptr = response;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE(FL("Failed to post msg to SME"));
 		qdf_mem_free(response);
@@ -595,7 +595,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf,
 	struct sir_dcc_update_ndl_response *resp;
 	WMI_DCC_UPDATE_NDL_RESP_EVENTID_param_tlvs *param_tlvs;
 	wmi_dcc_update_ndl_resp_event_fixed_param *fix_param;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 
 	param_tlvs = (WMI_DCC_UPDATE_NDL_RESP_EVENTID_param_tlvs *)event_buf;
 	fix_param = param_tlvs->fixed_param;
@@ -611,7 +611,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf,
 	msg.type = eWNI_SME_DCC_UPDATE_NDL_RSP;
 	msg.bodyptr = resp;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))	{
 		WMA_LOGE(FL("Failed to post msg to SME"));
 		qdf_mem_free(resp);
@@ -636,7 +636,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf,
 	struct sir_dcc_get_stats_response *response;
 	WMI_DCC_STATS_EVENTID_param_tlvs *param_tlvs;
 	wmi_dcc_stats_event_fixed_param *fix_param;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 
 	param_tlvs = (WMI_DCC_STATS_EVENTID_param_tlvs *)event_buf;
 	fix_param = param_tlvs->fixed_param;
@@ -657,7 +657,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf,
 	msg.type = eWNI_SME_DCC_STATS_EVENT;
 	msg.bodyptr = response;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))	{
 		WMA_LOGE(FL("Failed to post msg to SME"));
 		qdf_mem_free(response);

+ 2 - 2
core/wma/src/wma_power.c

@@ -1158,7 +1158,7 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event,
 				     uint32_t len)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	WMI_PDEV_TEMPERATURE_EVENTID_param_tlvs *param_buf;
 	wmi_pdev_temperature_event_fixed_param *wmi_event;
 
@@ -1175,7 +1175,7 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event,
 	sme_msg.bodyptr = NULL;
 	sme_msg.bodyval = wmi_event->value;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE(FL("Fail to post get temperature ind msg"));
 	}

+ 10 - 10
core/wma/src/wma_scan_roam.c

@@ -1874,7 +1874,7 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
 
 		if (roam_req->reason ==
 		    REASON_OS_REQUESTED_ROAMING_NOW) {
-			cds_msg_t cds_msg;
+			struct scheduler_msg cds_msg;
 			tSirRoamOffloadScanRsp *scan_offload_rsp;
 			scan_offload_rsp =
 				qdf_mem_malloc(sizeof(*scan_offload_rsp));
@@ -1894,8 +1894,8 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
 			 * SME with proper reason code.
 			 */
 			if (QDF_STATUS_SUCCESS !=
-			    cds_mq_post_message(QDF_MODULE_ID_SME,
-						(cds_msg_t *) &cds_msg)) {
+			    scheduler_post_msg(QDF_MODULE_ID_SME,
+						(struct scheduler_msg *) &cds_msg)) {
 				qdf_mem_free(scan_offload_rsp);
 				QDF_TRACE(QDF_MODULE_ID_WMA,
 					  QDF_TRACE_LEVEL_INFO,
@@ -2653,7 +2653,7 @@ void wma_process_unit_test_cmd(WMA_HANDLE handle,
 static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id)
 {
 	tSirSmeHOFailureInd *ho_failure_ind;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	QDF_STATUS qdf_status;
 
 	ho_failure_ind = qdf_mem_malloc(sizeof(tSirSmeHOFailureInd));
@@ -2667,7 +2667,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id)
 	sme_msg.bodyptr = ho_failure_ind;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME");
 		qdf_mem_free(ho_failure_ind);
@@ -3297,7 +3297,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId)
 {
 	tSirPrefNetworkFoundInd *nw_found_ind;
 	QDF_STATUS status;
-	cds_msg_t cds_msg;
+	struct scheduler_msg cds_msg;
 	uint8_t len, i;
 
 	for (i = 0; i < wma->max_bssid; i++) {
@@ -3329,7 +3329,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(QDF_MODULE_ID_SME, &cds_msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_SME, &cds_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Failed to post PNO completion match event to SME",
 			 __func__);
@@ -5739,7 +5739,7 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data,
  */
 void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id)
 {
-	cds_msg_t cds_msg;
+	struct scheduler_msg cds_msg;
 	tSirSmeCandidateFoundInd *candidate_ind;
 	struct scan_param *params;
 
@@ -5773,8 +5773,8 @@ 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(QDF_MODULE_ID_SME,
-						(cds_msg_t *) &cds_msg)) {
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_SME,
+						(struct scheduler_msg *) &cds_msg)) {
 		qdf_mem_free(candidate_ind);
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to post candidate ind to SME"));

+ 12 - 12
core/wma/src/wma_utils.c

@@ -342,7 +342,7 @@ void wma_lost_link_info_handler(tp_wma_handle wma, uint32_t vdev_id,
 {
 	struct sir_lost_link_info *lost_link_info;
 	QDF_STATUS qdf_status;
-	cds_msg_t sme_msg = {0};
+	struct scheduler_msg sme_msg = {0};
 
 	/* report lost link information only for STA mode */
 	if (wma->interfaces[vdev_id].vdev_up &&
@@ -361,7 +361,7 @@ void wma_lost_link_info_handler(tp_wma_handle wma, uint32_t vdev_id,
 		WMA_LOGI("%s: post msg to SME, bss_idx %d, rssi %d",  __func__,
 			 lost_link_info->vdev_id, lost_link_info->rssi);
 
-		qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+		qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			WMA_LOGE("%s: fail to post msg to SME", __func__);
 			qdf_mem_free(lost_link_info);
@@ -436,7 +436,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
 	tSirStatsExtEvent *stats_ext_event;
 	wmi_stats_ext_event_fixed_param *stats_ext_info;
 	QDF_STATUS status;
-	cds_msg_t cds_msg;
+	struct scheduler_msg cds_msg;
 	uint8_t *buf_ptr;
 	uint32_t alloc_len;
 
@@ -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(QDF_MODULE_ID_SME, &cds_msg);
+	status = scheduler_post_msg(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);
@@ -1379,7 +1379,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma,
 	int8_t rssi = 0;
 	QDF_STATUS qdf_status;
 	tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) wma->pGetRssiReq;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	int8_t bcn_snr, dat_snr;
 
 	bcn_snr = vdev_stats->vdev_snr.bcn_snr;
@@ -1480,7 +1480,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma,
 		sme_msg.bodyptr = p_snr_req;
 		sme_msg.bodyval = 0;
 
-		qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+		qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			WMA_LOGE("%s: Fail to post snr ind msg", __func__);
 			qdf_mem_free(p_snr_req);
@@ -1582,14 +1582,14 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus,
 			  uint8_t link_status)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 
 	pGetLinkStatus->linkStatus = link_status;
 	sme_msg.type = eWNI_SME_LINK_STATUS_IND;
 	sme_msg.bodyptr = pGetLinkStatus;
 	sme_msg.bodyval = 0;
 
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		WMA_LOGE("%s: Fail to post link status ind msg", __func__);
 		qdf_mem_free(pGetLinkStatus);
@@ -1863,7 +1863,7 @@ int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info,
 QDF_STATUS wma_send_link_speed(uint32_t link_speed)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	cds_msg_t sme_msg = { 0 };
+	struct scheduler_msg sme_msg = { 0 };
 	tSirLinkSpeedInfo *ls_ind =
 		(tSirLinkSpeedInfo *) qdf_mem_malloc(sizeof(tSirLinkSpeedInfo));
 	if (!ls_ind) {
@@ -1875,7 +1875,7 @@ QDF_STATUS wma_send_link_speed(uint32_t link_speed)
 		sme_msg.bodyptr = ls_ind;
 		sme_msg.bodyval = 0;
 
-		qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg);
+		qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			WMA_LOGE("%s: Fail to post linkspeed ind  msg",
 				 __func__);
@@ -2543,7 +2543,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle)
 	int ret;
 	uint8_t *payload;
 	uint32_t data_len;
-	cds_msg_t msg = { 0 };
+	struct scheduler_msg msg = { 0 };
 	QDF_STATUS status;
 
 	ret = wma_utf_rsp(wma_handle, &payload, &data_len);
@@ -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(QDF_MODULE_ID_SYS, &msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_SYS, &msg);
 
 	if (status != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("failed to post ftm response to SYS");