From 5bf0a3641db309dcec04a9b38b1f37efc9fb1651 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 1 Feb 2021 13:30:02 -0800
Subject: [PATCH] qcacld-3.0: Kbuild: Cleanup PKTLOG_OBJS logic

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

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

diff --git a/Kbuild b/Kbuild
index 9f0fb720b823..fa164644062e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1740,6 +1740,7 @@ CDP_INC := -I$(WLAN_COMMON_INC)/$(CDP_INC_DIR)
 PKTLOG_DIR :=      $(WLAN_COMMON_ROOT)/utils/pktlog
 PKTLOG_INC :=      -I$(WLAN_ROOT)/$(PKTLOG_DIR)/include
 
+ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 PKTLOG_OBJS :=	$(PKTLOG_DIR)/pktlog_ac.o \
 		$(PKTLOG_DIR)/pktlog_internal.o \
 		$(PKTLOG_DIR)/linux_ac.o
@@ -1749,6 +1750,7 @@ ifeq ($(CONFIG_PKTLOG_LEGACY), y)
 else
 	PKTLOG_OBJS  += $(PKTLOG_DIR)/pktlog_wifi3.o
 endif
+endif
 
 ############ HTT ############
 HTT_DIR :=      core/dp/htt
@@ -2485,10 +2487,7 @@ ifeq ($(CONFIG_IPA_OFFLOAD), y)
 OBJS +=		$(IPA_OBJS)
 endif
 
-ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 OBJS +=		$(PKTLOG_OBJS)
-endif
-
 OBJS +=		$(HOST_DIAG_LOG_OBJS)
 OBJS +=		$(DISA_OBJS)
 OBJS +=		$(ACTION_OUI_OBJS)