소스 검색

qcacld-3.0: Remove obsolete CDS mq APIs reference from HDD

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

Change-Id: I378c3354a66552e9c796befcd39b461980b93b27
CRs-Fixed: 1110497
Rajeev Kumar 8 년 전
부모
커밋
ea95edd926
4개의 변경된 파일11개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 2
      core/hdd/inc/wlan_hdd_ftm.h
  2. 2 3
      core/hdd/src/wlan_hdd_ftm.c
  3. 4 3
      core/hdd/src/wlan_hdd_ioctl.c
  4. 3 2
      core/hdd/src/wlan_hdd_wext.c

+ 2 - 2
core/hdd/inc/wlan_hdd_ftm.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.
  *
@@ -35,7 +35,7 @@
  */
 
 #include "qdf_status.h"
-#include "cds_mq.h"
+#include "scheduler_api.h"
 #include "cds_api.h"
 #include "msg.h"
 #include "qdf_types.h"

+ 2 - 3
core/hdd/src/wlan_hdd_ftm.c

@@ -31,7 +31,6 @@
  * This file contains the WLAN factory test mode implementation
  */
 
-#include <cds_mq.h>
 #include "cds_sched.h"
 #include <cds_api.h>
 #include "sir_types.h"
@@ -91,7 +90,7 @@ static void wlanqcmbr_mc_process_msg(void *message);
  */
 static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len)
 {
-	cds_msg_t ftmMsg;
+	struct scheduler_msg ftmMsg;
 
 	ENTER();
 
@@ -100,7 +99,7 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len)
 	ftmMsg.bodyptr = (uint8_t *) cmd_ptr;
 	ftmMsg.bodyval = 0;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_WMA,
 						      &ftmMsg)) {
 		hdd_err("Failed to post Msg to HAL");
 

+ 4 - 3
core/hdd/src/wlan_hdd_ioctl.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.
  *
@@ -35,6 +35,7 @@
 #include "wlan_hdd_driver_ops.h"
 #include "cds_concurrency.h"
 #include "wlan_hdd_hostapd.h"
+#include "scheduler_api.h"
 
 #include "wlan_hdd_p2p.h"
 #include <linux/ctype.h>
@@ -842,7 +843,7 @@ void hdd_wma_send_fastreassoc_cmd(int sessionId, const tSirMacAddr bssid,
 				  int channel)
 {
 	struct wma_roam_invoke_cmd *fastreassoc;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 
 	fastreassoc = qdf_mem_malloc(sizeof(*fastreassoc));
 	if (NULL == fastreassoc) {
@@ -861,7 +862,7 @@ void hdd_wma_send_fastreassoc_cmd(int sessionId, const tSirMacAddr bssid,
 	msg.type = SIR_HAL_ROAM_INVOKE;
 	msg.reserved = 0;
 	msg.bodyptr = fastreassoc;
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_WMA,
 								&msg)) {
 		qdf_mem_free(fastreassoc);
 		hdd_err("Not able to post ROAM_INVOKE_CMD message to WMA");

+ 3 - 2
core/hdd/src/wlan_hdd_wext.c

@@ -39,6 +39,7 @@
 #include <mac_trace.h>
 #include <wlan_hdd_includes.h>
 #include <cds_api.h>
+#include "scheduler_api.h"
 #include <net/arp.h>
 #include <cdp_txrx_stats.h>
 #include "sir_params.h"
@@ -8659,7 +8660,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 	case WE_UNIT_TEST_CMD:
 	{
 		t_wma_unit_test_cmd *unitTestArgs;
-		cds_msg_t msg = { 0 };
+		struct scheduler_msg msg = { 0 };
 		int i, j;
 		if ((apps_args[0] < WLAN_MODULE_ID_MIN) ||
 		    (apps_args[0] >= WLAN_MODULE_ID_MAX)) {
@@ -8688,7 +8689,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		msg.reserved = 0;
 		msg.bodyptr = unitTestArgs;
 		if (QDF_STATUS_SUCCESS !=
-		    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+		    scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 			qdf_mem_free(unitTestArgs);
 			hdd_err("Not able to post UNIT_TEST_CMD message to WMA");
 			return -EINVAL;