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

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

Merge c67e0400 on remote branch 

Change-Id: I8926c113e8c143518b85308a6c0f0975c95c28be
parents cce0e7c2 c67e0400

components/mlme/core/src/wlan_mlme_main.c

+2 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ mlme_init_qos_edca_params(struct wlan_objmgr_psoc *psoc, 
	edca_params->enable_edca_params =

			cfg_get(psoc, CFG_EDCA_ENABLE_PARAM);



	edca_params->enable_wmm_txop =

			cfg_get(psoc, CFG_ENABLE_WMM_TXOP);

	edca_params->edca_ac_vo.vo_cwmin =

			cfg_get(psoc, CFG_EDCA_VO_CWMIN);

	edca_params->edca_ac_vo.vo_cwmax =

components/mlme/dispatcher/inc/cfg_mlme_edca_params.h

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

 * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 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
@@ -481,6 +482,28 @@ 
		0, \

		"Enable edca parameter")



/*

 * <ini>

 * enable_wmm_txop - Enable WMM based txop feature

 * @Min: 0

 * @Max: 1

 * @Default: 1

 *

 * This ini is used to enable/disable the WMM based txop feature in FW

 *

 * Related: None

 *

 * Supported Feature: STA

 *

 * Usage: Internal

 *

 * </ini>

 */

#define CFG_ENABLE_WMM_TXOP CFG_INI_BOOL( \

		"enable_wmm_txop", \

		1, \

		"Enable WMM TXOP")



/*

 * <ini>

 * gEdcaVoCwmin - Set Cwmin value for QCA_WLAN_AC_VO
@@ -838,6 +861,7 @@ 
	CFG(CFG_EDCA_BK_AIFS) \

	CFG(CFG_EDCA_BE_CWMIN) \

	CFG(CFG_EDCA_BE_CWMAX) \

	CFG(CFG_ENABLE_WMM_TXOP) \

	CFG(CFG_EDCA_BE_AIFS)



#endif  /* __CFG_MLME_EDCA__PARAM_H */

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ struct wlan_mlme_edca_params { 
	struct mlme_cfg_str etsi_acvo_b;



	bool enable_edca_params;

	bool enable_wmm_txop;

	struct mlme_edca_ac_vo edca_ac_vo;

	struct mlme_edca_ac_vi edca_ac_vi;

	struct mlme_edca_ac_bk edca_ac_bk;

components/nan/core/src/nan_main.c

+9 −2
Original line number Diff line number Diff line
@@ -885,8 +885,16 @@ static QDF_STATUS nan_handle_enable_rsp(struct nan_event_params *nan_event) 
	psoc_nan_obj->nan_social_ch_2g_freq = 0;

	psoc_nan_obj->nan_social_ch_5g_freq = 0;

	nan_set_discovery_state(psoc, NAN_DISC_DISABLED);

	if (ucfg_is_nan_dbs_supported(psoc))

		policy_mgr_check_n_start_opportunistic_timer(psoc);



	/*

	 * If FW respond with NAN enable failure, then TDLS should be enable

	 * again if there is TDLS connection exist earlier.

	 * decrement the active TDLS session.

	 */

	ucfg_tdls_notify_connect_failure(psoc);



done:

	nan_conc_callback = psoc_nan_obj->cb_obj.nan_concurrency_update;

	if (nan_conc_callback)
@@ -1113,7 +1121,6 @@ bool nan_is_enable_allowed(struct wlan_objmgr_psoc *psoc, uint32_t nan_ch_freq) 
	}



	return (NAN_DISC_DISABLED == nan_get_discovery_state(psoc) &&

		ucfg_is_nan_conc_control_supported(psoc) &&

		policy_mgr_allow_concurrency(psoc, PM_NAN_DISC_MODE,

					     nan_ch_freq, HW_MODE_20_MHZ));

}

components/nan/dispatcher/src/nan_ucfg_api.c

+12 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.

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

 * Copyright (c) 2021-2022 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
@@ -35,6 +35,7 @@ 
#include "cfg_nan.h"

#include "wlan_mlme_api.h"

#include "cfg_nan_api.h"

#include "wlan_tdls_ucfg_api.h"



struct wlan_objmgr_psoc;

struct wlan_objmgr_vdev;
@@ -876,8 +877,16 @@ QDF_STATUS ucfg_nan_discovery_req(void *in_req, uint32_t req_type) 
			if (req_type == NAN_ENABLE_REQ) {

				nan_set_discovery_state(psoc,

							NAN_DISC_DISABLED);

				policy_mgr_check_n_start_opportunistic_timer(

									psoc);

				if (ucfg_is_nan_dbs_supported(psoc))

					policy_mgr_check_n_start_opportunistic_timer(psoc);



				/*

				 * If FW respond with NAN enable failure, then

				 * TDLS should be enable again if there is TDLS

				 * connection exist earlier.

				 * decrement the active TDLS session.

				 */

				ucfg_tdls_notify_connect_failure(psoc);

			} else if (req_type == NAN_DISABLE_REQ) {

				nan_disable_cleanup(psoc);

			}