From 735d9fedfc507386899ec3ee1782a38b18c786e6 Mon Sep 17 00:00:00 2001
From: Vevek Venkatesan <vevekv@codeaurora.org>
Date: Thu, 6 Jun 2019 19:21:25 +0530
Subject: [PATCH] qcacmn: CONFIG_MCL cleanup in HAL layer

CONFIG_MCL cleanup in cmn driver HAL layer.

Change-Id: I1fa4657a8ffa87d571157e635ecedf8e8af0bf07
CRs-Fixed: 2467203
---
 hal/wifi3.0/hal_generic_api.h     | 4 ++--
 hal/wifi3.0/hal_hw_headers.h      | 2 +-
 hal/wifi3.0/qca6290/hal_6290_tx.h | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h
index 2a0896f52e..e93c56b0d7 100644
--- a/hal/wifi3.0/hal_generic_api.h
+++ b/hal/wifi3.0/hal_generic_api.h
@@ -157,7 +157,7 @@ static inline void hal_tx_desc_set_buf_addr_generic(void *desc,
 		HAL_TX_SM(UNIFIED_TCL_DATA_CMD_2, BUF_OR_EXT_DESC_TYPE, type);
 }
 
-#if defined(CONFIG_MCL) && defined(QCA_WIFI_QCA6290_11AX)
+#if defined(QCA_WIFI_QCA6290_11AX_MU_UL) && defined(QCA_WIFI_QCA6290_11AX)
 /**
  * hal_rx_handle_other_tlvs() - handle special TLVs like MU_UL
  * tlv_tag: Taf of the TLVs
@@ -239,7 +239,7 @@ hal_rx_handle_other_tlvs(uint32_t tlv_tag, void *rx_tlv,
 {
 	return false;
 }
-#endif /* CONFIG_MCL && QCA_WIFI_QCA6290_11AX */
+#endif /* QCA_WIFI_QCA6290_11AX_MU_UL && QCA_WIFI_QCA6290_11AX */
 
 #if defined(RX_PPDU_END_USER_STATS_1_OFDMA_INFO_VALID_OFFSET)
 static inline void
diff --git a/hal/wifi3.0/hal_hw_headers.h b/hal/wifi3.0/hal_hw_headers.h
index 1c96552a35..b37ec18b3e 100644
--- a/hal/wifi3.0/hal_hw_headers.h
+++ b/hal/wifi3.0/hal_hw_headers.h
@@ -57,7 +57,7 @@
 #include "rxpcu_ppdu_end_info.h"
 #include "phyrx_he_sig_a_su.h"
 #include "phyrx_he_sig_a_mu_dl.h"
-#if defined(CONFIG_MCL) && defined(QCA_WIFI_QCA6290_11AX)
+#if defined(QCA_WIFI_QCA6290_11AX_MU_UL) && defined(QCA_WIFI_QCA6290_11AX)
 #include "phyrx_he_sig_a_mu_ul.h"
 #endif
 #include "phyrx_he_sig_b1_mu.h"
diff --git a/hal/wifi3.0/qca6290/hal_6290_tx.h b/hal/wifi3.0/qca6290/hal_6290_tx.h
index 09b022fb75..abbcc2b6b6 100644
--- a/hal/wifi3.0/qca6290/hal_6290_tx.h
+++ b/hal/wifi3.0/qca6290/hal_6290_tx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-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
@@ -46,7 +46,6 @@ static void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc,
 		  DSCP_TID_TABLE_NUM, id);
 }
 #else
-#ifdef CONFIG_MCL
 static void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc,
 						   uint8_t id)
 {
@@ -56,7 +55,6 @@ static void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc,
 				  DSCP_TO_TID_PRIORITY_TABLE_ID, id);
 }
 #endif
-#endif
 
 
 #define DSCP_TID_TABLE_SIZE 24