From bc611919e0be4f67df3c5fc150a9dd83089063d3 Mon Sep 17 00:00:00 2001
From: Rajesh Chauhan <rajeshc@codeaurora.org>
Date: Sat, 6 Jun 2020 18:35:52 -0700
Subject: [PATCH] Revert "qcacld-3.0: Use IS_ENABLED for the definition of
 kernel module"

This reverts Change-Id: Iaf86c9da2a9946aac09867b5c46dcc79f1b5c37e.
That change fails build for GKI variant.

Change-Id: I6cd7322870023d245fe9d20250ceb0b5d738d214
CRs-Fixed: 2701642
---
 configs/default_defconfig          | 5 +----
 configs/genoa.pci.debug_defconfig  | 5 +----
 configs/genoa.pci.perf_defconfig   | 5 +----
 configs/genoa.snoc.debug_defconfig | 5 +----
 configs/genoa.snoc.perf_defconfig  | 5 +----
 configs/qca6174_defconfig          | 5 +----
 configs/qca6390_defconfig          | 5 +----
 configs/qcs40x.snoc.perf_defconfig | 5 +----
 core/dp/txrx/ol_txrx_ipa.c         | 2 +-
 core/dp/txrx/ol_txrx_ipa.h         | 2 +-
 10 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/configs/default_defconfig b/configs/default_defconfig
index 2f8b05dd71cb..e440eb1c90f7 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -760,10 +760,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/genoa.pci.debug_defconfig b/configs/genoa.pci.debug_defconfig
index 8b5c72c185f3..a75b7479518f 100644
--- a/configs/genoa.pci.debug_defconfig
+++ b/configs/genoa.pci.debug_defconfig
@@ -27,10 +27,7 @@ CONFIG_IPA_OFFLOAD := y
 else
 CONFIG_IPA_DISABLE_OVERRIDE=y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 else
 CONFIG_IPA_DISABLE_OVERRIDE=y
diff --git a/configs/genoa.pci.perf_defconfig b/configs/genoa.pci.perf_defconfig
index 4afd8225c177..66e1127060c5 100644
--- a/configs/genoa.pci.perf_defconfig
+++ b/configs/genoa.pci.perf_defconfig
@@ -24,10 +24,7 @@ CONFIG_DATA_CE_SW_INDEX_NO_INLINE_UPDATE := n
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/genoa.snoc.debug_defconfig b/configs/genoa.snoc.debug_defconfig
index 09d3fa7e5f1e..00193403998c 100644
--- a/configs/genoa.snoc.debug_defconfig
+++ b/configs/genoa.snoc.debug_defconfig
@@ -36,10 +36,7 @@ endif
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index 64032e4c95ba..800c77405dff 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -36,10 +36,7 @@ endif
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index ee35c0ec85f5..a60c095633d1 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -490,10 +490,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index 3ee4d11cbbc2..a02bbd6d83d5 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -527,10 +527,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/configs/qcs40x.snoc.perf_defconfig b/configs/qcs40x.snoc.perf_defconfig
index a5891adbc3ff..1a3bd0e58400 100644
--- a/configs/qcs40x.snoc.perf_defconfig
+++ b/configs/qcs40x.snoc.perf_defconfig
@@ -77,10 +77,7 @@ endif
 ifeq ($(CONFIG_IPA), y)
 CONFIG_IPA_OFFLOAD := y
 endif
-ifeq ($(CONFIG_IPA3), m)
-CONFIG_IPA3_MODULE := y
-endif
-ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
+ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
diff --git a/core/dp/txrx/ol_txrx_ipa.c b/core/dp/txrx/ol_txrx_ipa.c
index 9cef7ae6b412..f17aa431d63c 100644
--- a/core/dp/txrx/ol_txrx_ipa.c
+++ b/core/dp/txrx/ol_txrx_ipa.c
@@ -143,7 +143,7 @@ QDF_STATUS ol_txrx_ipa_uc_get_resource(struct cdp_soc_t *soc_hdl,
 				&ipa_res->tx_comp_ring->mem_info)) ||
 	    (0 == qdf_mem_get_dma_addr(osdev,
 				&ipa_res->rx_rdy_ring->mem_info))
-#if defined(QCA_WIFI_3_0) && IS_ENABLED(CONFIG_IPA3)
+#if defined(QCA_WIFI_3_0) && defined(CONFIG_IPA3)
 	    || (0 == qdf_mem_get_dma_addr(osdev,
 				&ipa_res->rx2_rdy_ring->mem_info))
 #endif
diff --git a/core/dp/txrx/ol_txrx_ipa.h b/core/dp/txrx/ol_txrx_ipa.h
index 7d1249fc2a37..10892a83c993 100644
--- a/core/dp/txrx/ol_txrx_ipa.h
+++ b/core/dp/txrx/ol_txrx_ipa.h
@@ -92,7 +92,7 @@ struct ol_txrx_ipa_uc_rx_hdr {
 #define OL_TXRX_IPA_UC_WLAN_HDR_DES_MAC_OFFSET \
 	(OL_TXRX_IPA_WLAN_FRAG_HEADER + OL_TXRX_IPA_WLAN_IPA_HEADER)
 
-#if defined(QCA_WIFI_3_0) && IS_ENABLED(CONFIG_IPA3)
+#if defined(QCA_WIFI_3_0) && defined(CONFIG_IPA3)
 #define OL_TXRX_IPA_WDI2_SET(pipe_in, ipa_res, osdev) \
 	do { \
 		QDF_IPA_PIPE_IN_UL_RDY_RING_RP_VA(pipe_in) = \