From 58744b93a3d4f644500c4b79add571e35b5ea73d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 1 Feb 2021 12:19:38 -0800
Subject: [PATCH] qcacld-3.0: Kbuild: Cleanup UMAC_CRYPTO_OBJS logic

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

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

diff --git a/Kbuild b/Kbuild
index be94bf8bdfe0..329b9fbaa19c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -967,11 +967,13 @@ UMAC_CRYPTO_DIR := umac/cmn_services/crypto
 UMAC_CRYPTO_CORE_DIR := $(WLAN_COMMON_ROOT)/$(UMAC_CRYPTO_DIR)/src
 UMAC_CRYPTO_INC := -I$(WLAN_COMMON_INC)/$(UMAC_CRYPTO_DIR)/inc \
 		-I$(WLAN_COMMON_INC)/$(UMAC_CRYPTO_DIR)/src
+ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
 UMAC_CRYPTO_OBJS := $(UMAC_CRYPTO_CORE_DIR)/wlan_crypto_global_api.o \
 		$(UMAC_CRYPTO_CORE_DIR)/wlan_crypto_ucfg_api.o \
 		$(UMAC_CRYPTO_CORE_DIR)/wlan_crypto_main.o \
 		$(UMAC_CRYPTO_CORE_DIR)/wlan_crypto_obj_mgr.o \
 		$(UMAC_CRYPTO_CORE_DIR)/wlan_crypto_param_handling.o
+endif
 
 ############# FTM CORE ############
 FTM_CORE_DIR := ftm
@@ -2515,10 +2517,7 @@ ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y)
 OBJS +=		$(UMAC_GREEN_AP_OBJS)
 endif
 
-ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
 OBJS +=		$(UMAC_CRYPTO_OBJS)
-endif
-
 OBJS +=		$(DP_OBJS)
 ifeq ($(CONFIG_INTERFACE_MGR), y)
 OBJS += 	$(UMAC_INTERFACE_MGR_OBJS)