From a317f7c6152aa0a8b1e0f79a5321cdd4817fd4e0 Mon Sep 17 00:00:00 2001
From: Ke Huang <keh@codeaurora.org>
Date: Thu, 23 Sep 2021 14:26:13 +0800
Subject: [PATCH] qcacmn: Adjust the IPA WDI2 CONS/PROD definition

Adjust IPA WDI2 CONS/PROD definition for the IPA support on
sa415m for Genoa.

Change-Id: I7d73cd8d2843875fa6208cb520d49d4f6170fef7
CRs-Fixed: 3042786
---
 qdf/inc/qdf_ipa.h         | 7 +++----
 qdf/linux/src/i_qdf_ipa.h | 9 +++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/qdf/inc/qdf_ipa.h b/qdf/inc/qdf_ipa.h
index ad145d4d2a..7c63fbbf98 100644
--- a/qdf/inc/qdf_ipa.h
+++ b/qdf/inc/qdf_ipa.h
@@ -285,10 +285,9 @@ typedef void (*qdf_ipa_ready_cb)(void *user_data);
 #define QDF_IPA_CLIENT_MCC2_CONS          QDF_IPA_CLIENT_WLAN3_CONS
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
-#define QDF_IPA_CLIENT_WLAN_WDI2_CONS QDF_IPA_CLIENT_WLAN4_CONS
-#define QDF_IPA_CLIENT_WLAN_WDI2_PROD QDF_IPA_CLIENT_WLAN4_PROD
+#ifdef QCN7605_SUPPORT
+#define QDF_IPA_CLIENT_WLAN_WDI2_CONS __QDF_IPA_CLIENT_WLAN_WDI2_CONS
+#define QDF_IPA_CLIENT_WLAN_WDI2_PROD __QDF_IPA_CLIENT_WLAN_WDI2_PROD
 #else
 #define QDF_IPA_CLIENT_WLAN_WDI2_CONS QDF_IPA_CLIENT_WLAN1_CONS
 #define QDF_IPA_CLIENT_WLAN_WDI2_PROD QDF_IPA_CLIENT_WLAN1_PROD
diff --git a/qdf/linux/src/i_qdf_ipa.h b/qdf/linux/src/i_qdf_ipa.h
index 3f95150870..df5e765385 100644
--- a/qdf/linux/src/i_qdf_ipa.h
+++ b/qdf/linux/src/i_qdf_ipa.h
@@ -557,6 +557,15 @@ typedef struct ipa_wlan_hdr_attrib_val __qdf_ipa_wlan_hdr_attrib_val_t;
 #define __QDF_IPA_CLIENT_WLAN4_CONS IPA_CLIENT_WLAN4_CONS
 #define __QDF_IPA_CLIENT_WLAN4_PROD IPA_CLIENT_WLAN4_PROD
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)) && \
+	(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
+#define __QDF_IPA_CLIENT_WLAN_WDI2_CONS IPA_CLIENT_WLAN4_CONS
+#define __QDF_IPA_CLIENT_WLAN_WDI2_PROD IPA_CLIENT_WLAN4_PROD
+#else
+#define __QDF_IPA_CLIENT_WLAN_WDI2_CONS IPA_CLIENT_WLAN1_CONS
+#define __QDF_IPA_CLIENT_WLAN_WDI2_PROD IPA_CLIENT_WLAN1_PROD
+#endif
+
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
 #define IPA_LAN_RX_NAPI_SUPPORT
 #endif