qcacld-3.0: Remove CONFIG_CRYPTO_COMPONENT flag

The crypto component is always enabled. As a result, the feature flag
CONFIG_CRYPTO_COMPONENT is pointless, so remove it.

Change-Id: I97c22f3bf1224ecd967212d762545890f71764bc
CRs-Fixed: 3496915
This commit is contained in:
Jeff Johnson 2023-05-12 20:52:49 -07:00 committed by Rahul Choudhary
parent c5742d0e4a
commit 4013420fea
2 changed files with 1 additions and 9 deletions

9
Kbuild
View File

@ -1066,11 +1066,7 @@ OS_IF_OBJ += $(OS_IF_DIR)/linux/wlan_osif_request_manager.o \
$(OS_IF_DIR)/linux/mlme/src/osif_cm_roam_rsp.o \
$(OS_IF_DIR)/linux/mlme/src/osif_vdev_mgr_util.o
CONFIG_CRYPTO_COMPONENT := y
ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
OS_IF_OBJ += $(OS_IF_DIR)/linux/crypto/src/wlan_cfg80211_crypto.o
endif
$(call add-wlan-objs,os_if,$(OS_IF_OBJ))
@ -1219,13 +1215,12 @@ 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
$(call add-wlan-objs,umac_crypto,$(UMAC_CRYPTO_OBJS))
@ -1879,9 +1874,7 @@ ifeq ($(CONFIG_FEATURE_VDEV_OPS_WAKELOCK), y)
TARGET_IF_OBJ += $(TARGET_IF_DIR)/mlme/psoc/src/target_if_psoc_wake_lock.o
endif
ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
TARGET_IF_OBJ += $(TARGET_IF_DIR)/crypto/src/target_if_crypto.o
endif
ifeq ($(CONFIG_IPA_OFFLOAD), y)
TARGET_IF_OBJ += $(TARGET_IF_DIR)/ipa/src/target_if_ipa.o

View File

@ -13,7 +13,6 @@ CONFIG_QCACLD_WLAN_LFR2 := y
CONFIG_QCACLD_WLAN_LFR3 := n
CONFIG_QCOM_TDLS := y
CONFIG_QCACLD_FEATURE_GREEN_AP := n
CONFIG_CRYPTO_COMPONENT := y
CONFIG_QCOM_VOWIFI_11R := y
CONFIG_WLAN_FEATURE_FILS := y
CONFIG_QCOM_LTE_COEX := n