From 4ceac79889ac5c8ed9eb5ca238a6d1e66ebbb23b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 1 Feb 2021 14:11:49 -0800
Subject: [PATCH] qcacld-3.0: Kbuild: Cleanup HTT_OBJS logic

Currently HTT_OBJS are added to OBJS when CONFIG_LITHIUM is not
enabled.  An upcoming change requires that assignments to OBJS be
unconditional, so relocate the condition to wrap the assignment of
HTT_OBJS.

Change-Id: Ifdce8f5ab6b4597156341620ae101ee8be2b4afd
CRs-Fixed: 2868008
---
 Kbuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Kbuild b/Kbuild
index 04ef9f824c20..641acaf96e0e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1765,6 +1765,7 @@ endif
 HTT_DIR :=      core/dp/htt
 HTT_INC :=      -I$(WLAN_ROOT)/$(HTT_DIR)
 
+ifneq ($(CONFIG_LITHIUM), y)
 HTT_OBJS := $(HTT_DIR)/htt_tx.o \
             $(HTT_DIR)/htt.o \
             $(HTT_DIR)/htt_t2h.o \
@@ -1783,6 +1784,7 @@ endif
 ifeq ($(CONFIG_HL_DP_SUPPORT), y)
 HTT_OBJS += $(HTT_DIR)/htt_rx_hl.o
 endif
+endif
 
 ############## INIT-DEINIT ###########
 INIT_DEINIT_DIR := init_deinit/dispatcher
@@ -2443,10 +2445,7 @@ OBJS +=		$(HIF_OBJS) \
 		$(CLD_TARGET_IF_OBJ) \
 		$(GLOBAL_LMAC_IF_OBJ)
 
-ifneq ($(CONFIG_LITHIUM), y)
 OBJS += 	$(HTT_OBJS)
-endif
-
 OBJS += 	$(HAL_OBJS)
 OBJS +=		$(FWLOG_OBJS)
 OBJS += 	$(EPPING_OBJS)