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

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

Merge 074c34f9 on remote branch 

Change-Id: Icd03ca93693defab3f1dcedc2e34de346f252f2e
parents 4a668546 074c34f9

Kbuild

+5 −2
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))

components/mlme/core/src/wlan_mlme_main.c

+3 −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
@@ -436,6 +437,7 @@ static void mlme_init_generic_cfg(struct wlan_objmgr_psoc *psoc, 
		cfg_get(psoc, CFG_SAE_CONNECION_RETRIES);

	gen->monitor_mode_concurrency =

		cfg_get(psoc, CFG_MONITOR_MODE_CONCURRENCY);

	gen->tx_retry_multiplier = cfg_get(psoc, CFG_TX_RETRY_MULTIPLIER);

}



static void mlme_init_edca_ani_cfg(struct wlan_objmgr_psoc *psoc,
@@ -1606,6 +1608,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

components/mlme/dispatcher/inc/cfg_mlme_generic.h

+28 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2021 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
@@ -853,6 +854,31 @@ enum monitor_mode_concurrency { 
	CFG_VALUE_OR_DEFAULT, \

	"Monitor mode concurrency supported")



/*

 * <ini>

 * tx_retry_multiplier - TX retry multiplier

 * @Min: 0

 * @Max: 500

 * @Default: 0

 *

 * This ini is used to indicate percentage to max retry limit to fw

 * which can further be used by fw to multiply counter by

 * tx_retry_multiplier percent.

 *

 * Supported Feature: STA/SAP

 *

 * Usage: External

 *

 * </ini>

 */

#define CFG_TX_RETRY_MULTIPLIER CFG_INI_UINT( \

	"tx_retry_multiplier", \

	0, \

	500, \

	0, \

	CFG_VALUE_OR_DEFAULT, \

	"percentage of max retry limit")



#define CFG_GENERIC_ALL \

	CFG(CFG_ENABLE_DEBUG_PACKET_LOG) \

	CFG(CFG_PMF_SA_QUERY_MAX_RETRIES) \
@@ -887,5 +913,6 @@ enum monitor_mode_concurrency { 
	CFG(CFG_DFS_CHAN_AGEOUT_TIME) \

	CFG(CFG_SAE_CONNECION_RETRIES) \

	CFG(CFG_WLS_6GHZ_CAPABLE) \

	CFG(CFG_MONITOR_MODE_CONCURRENCY)

	CFG(CFG_MONITOR_MODE_CONCURRENCY)\

	CFG(CFG_TX_RETRY_MULTIPLIER)

#endif /* __CFG_MLME_GENERIC_H */

components/mlme/dispatcher/inc/cfg_mlme_obss_ht40.h

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ 
 * bss_color_collision_det_sta - Enables BSS color collision detection in STA

 * @Min: 0

 * @Max: 1

 * @Default: 0

 * @Default: 1

 *

 * This ini used to enable or disable the BSS color collision detection in

 * STA mode if obss_color_collision_offload is enabled.
@@ -261,7 +261,7 @@ 
 */

#define CFG_BSS_CLR_COLLISION_DETCN_STA CFG_INI_BOOL( \

		"bss_color_collision_det_sta", \

		0, \

		1, \

		"BSS color collision detection in STA")



#define CFG_OBSS_HT40_ALL \

components/mlme/dispatcher/inc/wlan_mlme_api.h

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

 * Copyright (c) 2018-2021 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
@@ -3194,4 +3195,18 @@ QDF_STATUS mlme_set_user_ps(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, 
 * Return: True if user_ps flag is set

 */

bool mlme_get_user_ps(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id);



/**

 * wlan_mlme_get_tx_retry_multiplier() - Get the tx retry multiplier percentage

 *

 * @psoc: pointer to psoc object

 * @tx_retry_multiplier: pointer to hold user config value of

 * tx_retry_multiplier

 *

 * Return: QDF Status

 */

QDF_STATUS

wlan_mlme_get_tx_retry_multiplier(struct wlan_objmgr_psoc *psoc,

				  uint32_t *tx_retry_multiplier);



#endif /* _WLAN_MLME_API_H_ */