From 181cca70ebdacd147335366c0b8e63cc46e21832 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 9 Feb 2019 19:18:54 -0800 Subject: [PATCH] Revert "qcacld-3.0: Enable crypto convergence set key and IE support" This reverts commit Icf1a1f8150d8503f5527cf23b48dddfd4e9a5439. Feature is causing WEP regression. Change-Id: If638c88806d1cb93e92c61b516df464b1f62d678 CRs-Fixed: 2396619 --- Kbuild | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Kbuild b/Kbuild index aeee601731a4..d7bfcbd79de7 100644 --- a/Kbuild +++ b/Kbuild @@ -32,6 +32,7 @@ endif endif include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig + ############ UAPI ############ UAPI_DIR := uapi UAPI_INC := -I$(WLAN_ROOT)/$(UAPI_DIR)/linux @@ -628,11 +629,6 @@ OS_IF_INC += -I$(WLAN_COMMON_INC)/os_if/linux \ OS_IF_OBJ += $(OS_IF_DIR)/linux/wlan_osif_request_manager.o \ $(OS_IF_DIR)/linux/crypto/src/wlan_nl_to_crypto_params.o -ifeq ($(CONFIG_CRYPTO_COMPONENT), y) -OS_IF_OBJ += $(OS_IF_DIR)/linux/crypto/src/wlan_cfg80211_crypto.o -endif - - ############ UMAC_DISP ############ UMAC_DISP_DIR := umac/global_umac_dispatcher/lmac_if UMAC_DISP_INC_DIR := $(UMAC_DISP_DIR)/inc @@ -712,7 +708,6 @@ 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 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 @@ -1062,7 +1057,6 @@ TARGET_IF_DIR := $(WLAN_COMMON_ROOT)/target_if TARGET_IF_INC := -I$(WLAN_COMMON_INC)/target_if/core/inc \ -I$(WLAN_COMMON_INC)/target_if/core/src \ -I$(WLAN_COMMON_INC)/target_if/init_deinit/inc \ - -I$(WLAN_COMMON_INC)/target_if/crypto/inc \ -I$(WLAN_COMMON_INC)/target_if/regulatory/inc \ TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \ @@ -1074,10 +1068,6 @@ TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \ $(TARGET_IF_DIR)/init_deinit/src/init_event_handler.o \ $(TARGET_IF_DIR)/init_deinit/src/service_ready_util.o \ -ifeq ($(CONFIG_CRYPTO_COMPONENT), y) -TARGET_IF_OBJ += $(TARGET_IF_DIR)/crypto/src/target_if_crypto.o -endif - ########### GLOBAL_LMAC_IF ########## GLOBAL_LMAC_IF_DIR := $(WLAN_COMMON_ROOT)/global_lmac_if @@ -2302,8 +2292,6 @@ cppflags-$(CONFIG_QCACLD_FEATURE_APF) += -DFEATURE_WLAN_APF cppflags-$(CONFIG_WLAN_FEATURE_SARV1_TO_SARV2) += -DWLAN_FEATURE_SARV1_TO_SARV2 #CRYPTO Coverged Component cppflags-$(CONFIG_CRYPTO_COMPONENT) += -DWLAN_CONV_CRYPTO_SUPPORTED \ - -DCRYPTO_SET_KEY_CONVERGED \ - -DWLAN_CONV_CRYPTO_IE_SUPPORT \ -DWLAN_CRYPTO_WEP_OS_DERIVATIVE \ -DWLAN_CRYPTO_TKIP_OS_DERIVATIVE \ -DWLAN_CRYPTO_CCMP_OS_DERIVATIVE \