From fe2489c451e1708401396806aa59d1ee85eca791 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Tue, 10 Apr 2018 11:21:43 -0700
Subject: [PATCH] qcacld-3.0: Kbuild: Relocate HELIUMPLUS definitions

Currently if the driver is built directly within the kernel the
following Kconfig parameters will NOT be taken from the kernel
configuration:
- CONFIG_HELIUMPLUS
- CONFIG_64BIT_PADDR
- CONFIG_FEATURE_TSO
- CONFIG_FEATURE_TSO_DEBUG

Inversely, if the driver is built outside the kernel the following
parameter does not enforce the "depends on HELIUMPLUS" that is found
in the Kconfig:
- CONFIG_WLAN_LRO

Resolve these issues by relocating the HELIUMPLUS definition to inside
the "ifeq ($(KERNEL_BUILD), n)" portion of the Kbuild, and relocating
the other configurations such that they only get initialized when
HELIUMPLUS is enabled.

Change-Id: Ie41cd0a59bfa39fed39779e508bebbd6e29f6c0c
CRs-Fixed: 2222020
---
 Kbuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Kbuild b/Kbuild
index 9b12f27858a5..6cba2a34d57d 100644
--- a/Kbuild
+++ b/Kbuild
@@ -48,6 +48,18 @@ ifeq ($(KERNEL_BUILD), n)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
 
+	ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS)))
+		CONFIG_HELIUMPLUS := y
+		CONFIG_64BIT_PADDR := y
+		CONFIG_FEATURE_TSO := y
+		CONFIG_FEATURE_TSO_DEBUG := y
+		ifeq ($(CONFIG_INET_LRO), y)
+			CONFIG_WLAN_LRO := y
+		else
+			CONFIG_WLAN_LRO := n
+		endif
+	endif
+
 	ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
 	ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
 	CONFIG_BUILD_TAG := y
@@ -193,12 +205,6 @@ ifneq ($(CONFIG_ROME_IF),sdio)
 		CONFIG_WLAN_TX_FLOW_CONTROL_V2 := n
 	endif
 
-	# Flag to enable LRO (Large Receive Offload)
-	ifeq ($(CONFIG_INET_LRO), y)
-		CONFIG_WLAN_LRO := y
-	else
-		CONFIG_WLAN_LRO := n
-	endif
 endif
 endif
 
@@ -405,11 +411,7 @@ CONFIG_WIFI_POS_CONVERGED := y
 
 CONFIG_CP_STATS := y
 
-ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS)))
-CONFIG_HELIUMPLUS := y
-CONFIG_64BIT_PADDR := y
-CONFIG_FEATURE_TSO := y
-CONFIG_FEATURE_TSO_DEBUG := y
+ifeq ($(CONFIG_HELIUMPLUS), y)
 ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
 CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
 endif