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

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

Merge 166c36ed on remote branch 

Change-Id: Ia90f36ef44825a93058e116f9a9f71d1c856f42d
parents 5251d6b4 166c36ed

Kbuild

+2 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,8 @@ WMI_OBJS := $(WMI_OBJ_DIR)/wmi_unified.o \ 
	    $(WMI_OBJ_DIR)/wmi_unified_api.o \

	    $(WMI_OBJ_DIR)/wmi_unified_reg_api.o \

	    $(WMI_OBJ_DIR)/wmi_unified_vdev_api.o \

	    $(WMI_OBJ_DIR)/wmi_unified_vdev_tlv.o

	    $(WMI_OBJ_DIR)/wmi_unified_vdev_tlv.o \

	    $(WMI_OBJ_DIR)/wmi_unified_crypto_api.o



ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)

WMI_OBJS += $(WMI_OBJ_DIR)/wmi_unified_pmo_api.o

components/mlme/core/src/wlan_mlme_main.c

+3 −0
Original line number Diff line number Diff line
@@ -2359,6 +2359,9 @@ static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc, 
			      &valid_channel_list_num);

	reg->valid_channel_list_num = (uint8_t)valid_channel_list_num;



	reg->enable_nan_on_indoor_channels =

		cfg_get(psoc, CFG_INDOOR_CHANNEL_SUPPORT_FOR_NAN);



	pdev = wlan_objmgr_get_pdev_by_id(psoc, 0, WLAN_MLME_NB_ID);

	if (!pdev) {

		mlme_legacy_err("null pdev");

components/mlme/dispatcher/inc/cfg_mlme_reg.h

+24 −0
Original line number Diff line number Diff line
@@ -104,6 +104,29 @@ 
	CFG_VALUE_OR_DEFAULT, \

	"enable/disable ETSI SRD channels in master mode")



/*

 * <ini>

 * enable_nan_indoor_channel - Enable Indoor channels for NAN

 * @Min: 0

 * @Max: 1

 * @Default: 0

 *

 * This ini is used to support to indoor channels for NAN interface

 * Customer can config this item to enable/disable NAN in indoor channel

 *

 * Related: None

 *

 * Supported Feature: NAN

 *

 * Usage: External

 *

 * </ini>

 */

#define CFG_INDOOR_CHANNEL_SUPPORT_FOR_NAN CFG_INI_BOOL( \

	"enable_nan_indoor_channel", \

	0, \

	"enable/disable indoor channels for NAN")



#ifdef SAP_AVOID_ACS_FREQ_LIST

#define SAP_AVOID_ACS_FREQ_LIST_DEFAULT ""
@@ -334,6 +357,7 @@ 
	CFG(CFG_ENABLE_PENDING_CHAN_LIST_REQ) \

	CFG(CFG_ENABLE_11D_IN_WORLD_MODE) \

	CFG(CFG_ETSI_SRD_CHAN_IN_MASTER_MODE) \

	CFG(CFG_INDOOR_CHANNEL_SUPPORT_FOR_NAN) \

	CFG(CFG_RESTART_BEACONING_ON_CH_AVOID) \

	CFG(CFG_INDOOR_CHANNEL_SUPPORT) \

	CFG(CFG_SCAN_11D_INTERVAL) \

components/mlme/dispatcher/inc/wlan_mlme_api.h

+11 −0
Original line number Diff line number Diff line
@@ -1926,6 +1926,17 @@ wlan_mlme_get_srd_master_mode_for_vdev(struct wlan_objmgr_psoc *psoc, 
				       enum QDF_OPMODE vdev_opmode,

				       bool *value);



/**

 * wlan_mlme_get_indoor_support_for_nan  - Get indoor channel support for NAN

 * @psoc: pointer to psoc object

 * @value: pointer to the value which will be filled for the caller

 *

 * Return: QDF Status

 */

QDF_STATUS

wlan_mlme_get_indoor_support_for_nan(struct wlan_objmgr_psoc *psoc,

				     bool *value);



/**

 * wlan_mlme_get_vht_enable2x2() - Enables/disables VHT Tx/Rx MCS values for 2x2

 * @psoc: psoc context

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

+2 −0
Original line number Diff line number Diff line
@@ -2252,6 +2252,7 @@ enum mlme_reg_srd_master_modes { 
 * @enable_pending_chan_list_req: enables/disables scan channel

 * list command to FW till the current scan is complete.

 * @retain_nol_across_regdmn_update: Retain the NOL list across the regdomain.

 * @enable_nan_on_indoor_channels: Enable nan on Indoor channels

 */

struct wlan_mlme_reg {

	uint32_t self_gen_frm_pwr;
@@ -2272,6 +2273,7 @@ struct wlan_mlme_reg { 
	bool ignore_fw_reg_offload_ind;

	bool enable_pending_chan_list_req;

	bool retain_nol_across_regdmn_update;

	bool enable_nan_on_indoor_channels;

};



/**