From 7b6bee792a69d199cdb3082486e0bb1e50691528 Mon Sep 17 00:00:00 2001
From: Arun Kumar Khandavalli <akhandav@codeaurora.org>
Date: Thu, 14 Nov 2019 14:19:20 +0530
Subject: [PATCH] qcacld-3.0: move to the psoc mlme timers

Move the vdev response timer from the vdev object structure
to the psoc mlme structure.

Change-Id: I1df253331ddbd5538066ee93bc3e45b703057818
CRs-Fixed: 2563383
---
 Kbuild                  | 6 ++++--
 core/wma/src/wma_main.c | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Kbuild b/Kbuild
index b0f4a8268208..09877ed78f8a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1160,7 +1160,8 @@ TARGET_IF_INC := -I$(WLAN_COMMON_INC)/target_if/core/inc \
 		 -I$(WLAN_COMMON_INC)/target_if/crypto/inc \
 		 -I$(WLAN_COMMON_INC)/target_if/regulatory/inc \
 		 -I$(WLAN_COMMON_INC)/target_if/mlme/vdev_mgr/inc \
-		 -I$(WLAN_COMMON_INC)/target_if/dispatcher/inc
+		 -I$(WLAN_COMMON_INC)/target_if/dispatcher/inc \
+		 -I$(WLAN_COMMON_INC)/target_if/mlme/psoc/inc
 
 TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \
 		$(TARGET_IF_DIR)/regulatory/src/target_if_reg.o \
@@ -1171,7 +1172,8 @@ TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \
 		$(TARGET_IF_DIR)/init_deinit/src/init_event_handler.o \
 		$(TARGET_IF_DIR)/init_deinit/src/service_ready_util.o \
 		$(TARGET_IF_DIR)/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.o \
-		$(TARGET_IF_DIR)/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.o
+		$(TARGET_IF_DIR)/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.o \
+		$(TARGET_IF_DIR)/mlme/psoc/src/target_if_psoc_timer_tx_ops.o
 
 ifeq ($(CONFIG_FEATURE_VDEV_RSP_WAKELOCK), y)
 TARGET_IF_OBJ += $(TARGET_IF_DIR)/mlme/vdev_mgr/src/target_if_vdev_mgr_wake_lock.o
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index aff8a8b5aa0d..50e2334ebea4 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -99,6 +99,7 @@
 #include "wma_coex.h"
 #include "target_if_vdev_mgr_rx_ops.h"
 #include "wlan_policy_mgr_i.h"
+#include "target_if_psoc_timer_tx_ops.h"
 
 #ifdef DIRECT_BUF_RX_ENABLE
 #include <target_if_direct_buf_rx_api.h>
@@ -1692,7 +1693,7 @@ wma_cleanup_vdev_resp_and_hold_req(struct scheduler_msg *msg)
 	}
 
 	wma = msg->bodyptr;
-	target_if_flush_vdev_timers(wma->pdev);
+	target_if_flush_psoc_vdev_timers(wma->psoc);
 	wma_cleanup_hold_req(wma);
 
 	return QDF_STATUS_SUCCESS;