Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5f5211c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge df32c097 on remote branch 

Change-Id: I13d2488514cd3cb12e05d02337f19704ab751822
parents 393e567e df32c097

Kbuild

+8 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ endif 
ifeq ($(CONFIG_QCACLD_FEATURE_MPTA_HELPER), y)

HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_mpta_helper.o

endif



ifeq ($(CONFIG_QCACLD_FEATURE_HW_CAPABILITY), y)

HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_hw_capability.o

endif



########### HOST DIAG LOG ###########

HOST_DIAG_LOG_DIR :=	$(WLAN_COMMON_ROOT)/utils/host_diag_log
@@ -2067,6 +2072,9 @@ cppflags-$(CONFIG_QCACLD_FEATURE_COEX_CONFIG) += -DFEATURE_COEX_CONFIG 
#Flag to enable MPTA helper feature

cppflags-$(CONFIG_QCACLD_FEATURE_MPTA_HELPER) += -DFEATURE_MPTA_HELPER



#Flag to enable get hw capability

cppflags-$(CONFIG_QCACLD_FEATURE_HW_CAPABILITY) += -DFEATURE_HW_CAPABILITY



ifdef CONFIG_SCHED_HISTORY_SIZE

ccflags-y += -DWLAN_SCHED_HISTORY_SIZE=$(CONFIG_SCHED_HISTORY_SIZE)

endif

configs/default_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ ifeq ($(CONFIG_ARCH_QCS405), y) 
CONFIG_QCACLD_FEATURE_COEX_CONFIG := y

endif



#Flag to enable get hw capability

ifeq ($(CONFIG_ARCH_QCS405), y)

CONFIG_QCACLD_FEATURE_HW_CAPABILITY := y

endif



ifeq ($(CONFIG_ARCH_MSM8998), y)

CONFIG_QCACLD_FEATURE_METERING := y

endif

configs/qcs40x.snoc.perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_PTT_SOCK_SVC_ENABLE := y 
CONFIG_WMI_INTERFACE_EVENT_LOGGING := y

CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := y

CONFIG_DP_TRACE := n

CONFIG_QCACLD_FEATURE_HW_CAPABILITY := y



CONFIG_WLAN_LOG_FATAL := y

CONFIG_WLAN_LOG_ERROR := y

core/hdd/inc/wlan_hdd_main.h

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ enum hdd_driver_flags { 


#define WLAN_WAIT_TIME_FW_ROAM_STATS 1000



#define WLAN_WAIT_TIME_ANTENNA_ISOLATION 8000



/* Maximum time(ms) to wait for RSO CMD status event */

#define WAIT_TIME_RSO_CMD_STATUS 2000

core/hdd/src/wlan_hdd_assoc.c

+6 −2
Original line number Diff line number Diff line
@@ -5466,9 +5466,9 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter, 


	roam_profile = hdd_roam_profile(adapter);

	roam_profile->AuthType.numEntries = 1;

	hdd_debug("authType = %d RSNAuthType %d wpa_versions %d",

	hdd_debug("authType = %d RSNAuthType %d wpa_versions %d key_mgmt: 0x%x",

		  sta_ctx->conn_info.authType, RSNAuthType,

		  sta_ctx->wpa_versions);

		  sta_ctx->wpa_versions, key_mgmt);



	switch (sta_ctx->conn_info.authType) {

	case eCSR_AUTH_TYPE_OPEN_SYSTEM:
@@ -5563,6 +5563,10 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter, 
				/* OWE case */

				roam_profile->AuthType.authType[0] =

					eCSR_AUTH_TYPE_OWE;

			} else if (RSNAuthType == eCSR_AUTH_TYPE_SAE) {

				/* SAE with open authentication case */

				roam_profile->AuthType.authType[0] =

					eCSR_AUTH_TYPE_SAE;

			} else if ((RSNAuthType ==

				  eCSR_AUTH_TYPE_SUITEB_EAP_SHA256) &&

				  ((key_mgmt & HDD_AUTH_KEY_MGMT_802_1X)