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

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

Merge 166131e5 on remote branch 

Change-Id: I3cc270d6b54fcb423b66960c758493a229b2dcbd
parents 64b340a5 166131e5

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ ENABLE_QCACLD := true 
endif

endif



ifeq ($(BOARD_COMMON_DIR),)

    BOARD_COMMON_DIR := device/qcom/common

endif



ifeq  ($(ENABLE_QCACLD), true)

# Android makefile for the WLAN Module

LOCAL_PATH := $(call my-dir)
@@ -105,7 +109,7 @@ endif 


# DLKM_DIR was moved for JELLY_BEAN (PLATFORM_SDK 16)

ifeq ($(call is-platform-sdk-version-at-least,16),true)

	DLKM_DIR := $(TOP)/device/qcom/common/dlkm

	DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm

else

	DLKM_DIR := build/dlkm

endif # platform-sdk-version

Kbuild

+5 −3
Original line number Diff line number Diff line
@@ -1400,10 +1400,12 @@ $(call add-wlan-objs,action_oui,$(ACTION_OUI_OBJS)) 
######## PACKET CAPTURE ########



PKT_CAPTURE_DIR := components/pkt_capture

PKT_CAPTURE_OS_IF_DIR := os_if/pkt_capture

PKT_CAPTURE_TARGET_IF_DIR := components/target_if/pkt_capture/

PKT_CAPTURE_INC := -I$(WLAN_ROOT)/$(PKT_CAPTURE_DIR)/core/inc \

		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_DIR)/dispatcher/inc \

		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_TARGET_IF_DIR)/inc

		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_TARGET_IF_DIR)/inc \

		  -I$(WLAN_ROOT)/$(PKT_CAPTURE_OS_IF_DIR)/inc



ifeq ($(CONFIG_WLAN_FEATURE_PKT_CAPTURE), y)

PKT_CAPTURE_OBJS := $(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_main.o \
@@ -1412,7 +1414,8 @@ PKT_CAPTURE_OBJS := $(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_main.o \ 
		$(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_data_txrx.o \

		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_ucfg_api.o \

		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_tgt_api.o \

		$(PKT_CAPTURE_TARGET_IF_DIR)/src/target_if_pkt_capture.o

		$(PKT_CAPTURE_TARGET_IF_DIR)/src/target_if_pkt_capture.o \

		$(PKT_CAPTURE_OS_IF_DIR)/src/os_if_pkt_capture.o

endif



$(call add-wlan-objs,pkt_capture,$(PKT_CAPTURE_OBJS))
@@ -2694,7 +2697,6 @@ cppflags-$(CONFIG_PLD_PCIE_INIT_FLAG) += -DCONFIG_PLD_PCIE_INIT 
cppflags-$(CONFIG_WLAN_FEATURE_DP_RX_THREADS) += -DFEATURE_WLAN_DP_RX_THREADS

cppflags-$(CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT) += -DWLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT

cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE) += -DFEATURE_HAL_DELAYED_REG_WRITE

cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE_V2) += -DFEATURE_HAL_DELAYED_REG_WRITE_V2

cppflags-$(CONFIG_QCA_OL_DP_SRNG_LOCK_LESS_ACCESS) += -DQCA_OL_DP_SRNG_LOCK_LESS_ACCESS

cppflags-$(CONFIG_SHADOW_WRITE_DELAY) += -DSHADOW_WRITE_DELAY

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

+1 −2
Original line number Diff line number Diff line
@@ -2600,8 +2600,7 @@ QDF_STATUS policy_mgr_set_chan_switch_complete_evt( 
		return QDF_STATUS_SUCCESS;

	}



	status = qdf_event_set(

			&pm_ctx->channel_switch_complete_evt);

	status = qdf_event_set_all(&pm_ctx->channel_switch_complete_evt);



	if (!QDF_IS_STATUS_SUCCESS(status)) {

		policy_mgr_err("set event failed");

components/mlme/core/inc/wlan_mlme_main.h

+11 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -216,6 +217,14 @@ struct mscs_req_info { 
};

#endif



/**

 *  * struct mlme_connect_info - mlme connect information

 *  @ext_cap_ie: Ext CAP IE

 */

struct mlme_connect_info {

	uint8_t ext_cap_ie[DOT11F_IE_EXTCAP_MAX_LEN + 2];

};



/**

 * struct mlme_legacy_priv - VDEV MLME legacy priv object

 * @chan_switch_in_progress: flag to indicate that channel switch is in progress
@@ -252,6 +261,7 @@ struct mscs_req_info { 
 * @ba_2k_jump_iot_ap: This is set to true if connected to the ba 2k jump IOT AP

 * @bad_htc_he_iot_ap: Set to true if connected to AP who can't decode htc he

 * @is_usr_ps_enabled: Is Power save enabled

 * @connect_info: mlme connect information

 */

struct mlme_legacy_priv {

	bool chan_switch_in_progress;
@@ -291,6 +301,7 @@ struct mlme_legacy_priv { 
	bool ba_2k_jump_iot_ap;

	bool bad_htc_he_iot_ap;

	bool is_usr_ps_enabled;

	struct mlme_connect_info connect_info;

};

components/mlme/core/src/wlan_mlme_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,7 @@ static void mlme_init_roam_offload_cfg(struct wlan_objmgr_psoc *psoc, 
	lfr->idle_roam_band = cfg_get(psoc, CFG_LFR_IDLE_ROAM_BAND);

	lfr->sta_roam_disable = cfg_get(psoc, CFG_STA_DISABLE_ROAM);

	mlme_init_sae_single_pmk_cfg(psoc, lfr);

	qdf_mem_zero(&lfr->roam_rt_stats, sizeof(lfr->roam_rt_stats));

}



#else