android/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Kbuild: Cleanup UMAC_CRYPTO_OBJS logic

Browse Source 
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
This commit is contained in:
Jeff Johnson 2021-02-01 12:19:38 -08:00 committed by snandini
parent cf1b775c4d
commit eabfc29ca5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Kbuild
View File

@ -1017,11 +1017,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
@ -2598,10 +2600,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)
OBJS += $(UMAC_INTERFACE_MGR_OBJS)
OBJS += $(TXRX3.0_OBJS)