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

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

Merge 52274954 on remote branch 

Change-Id: I8813e3ab51f8924621092d73211615d921540e87
parents a91bb7b1 52274954

os_if/linux/qca_vendor.h

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

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

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

 * Copyright (c) 2022-2023 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
@@ -4822,6 +4822,17 @@ enum qca_wlan_vendor_attr_config { 
	 * this attribute are 1-Enable and 0-Disable.

	 */

	QCA_WLAN_VENDOR_ATTR_CONFIG_FT_OVER_DS = 80,



	/* 8-bit unsigned value, whenever wifi calling (wfc) begin or end,

	 * Userspace sends this information to driver/firmware to configure

	 * wfc state. Driver/Firmware uses this information to

	 * optimize power savings, rate adaption, roaming, etc.

	 *

	 * 1 - wfc is on.

	 * 0 - wfc is off.

	 */

	QCA_WLAN_VENDOR_ATTR_CONFIG_WFC_STATE = 86,



	/* keep last */

	QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST,

	QCA_WLAN_VENDOR_ATTR_CONFIG_MAX =

target_if/init_deinit/src/init_event_handler.c

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

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

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

 * Copyright (c) 2022-2023 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
@@ -43,6 +43,24 @@ static void init_deinit_set_send_init_cmd(struct wlan_objmgr_psoc *psoc, 
	init_deinit_prepare_send_init_cmd(psoc, tgt_hdl);

}



#ifdef WLAN_FEATURE_P2P_P2P_STA

static void

init_deinit_update_p2p_p2p_conc_support(struct wmi_unified *wmi_handle,

					struct wlan_objmgr_psoc *psoc)

{

	if (wmi_service_enabled(wmi_handle, wmi_service_p2p_p2p_cc_support))

		wlan_psoc_nif_fw_ext_cap_set(psoc,

					     WLAN_SOC_EXT_P2P_P2P_CONC_SUPPORT);

	else

		target_if_debug("P2P + P2P conc disabled");

}

#else

static inline void

init_deinit_update_p2p_p2p_conc_support(struct wmi_unified *wmi_handle,

					struct wlan_objmgr_psoc *psoc)

{}

#endif



static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,

							uint8_t *event,

							uint32_t data_len)
@@ -211,6 +229,7 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle, 
					       WLAN_SOC_CEXT_WMI_MGMT_REF);

		target_if_debug("WMI mgmt service disabled");

	}

	init_deinit_update_p2p_p2p_conc_support(wmi_handle, psoc);



	err_code = init_deinit_handle_host_mem_req(psoc, tgt_hdl, event);

	if (err_code != QDF_STATUS_SUCCESS)

target_if/regulatory/inc/target_if_reg_11d.h

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

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

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

 *

 *

 * Permission to use, copy, modify, and/or distribute this software for
@@ -32,7 +33,7 @@ 
#include "wmi_unified_api.h"

#include "wmi_unified_reg_api.h"



#ifdef HOST_11D_SCAN

#ifdef TARGET_11D_SCAN

/**

 * tgt_if_regulatory_is_11d_offloaded() - Check if reg 11d is offloaded.

 * @psoc: psoc pointer

target_if/regulatory/src/target_if_reg_11d.c

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

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

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

 *

 *

 * Permission to use, copy, modify, and/or distribute this software for
@@ -24,7 +25,7 @@ 


#include "target_if_reg_11d.h"



#ifdef HOST_11D_SCAN

#ifdef TARGET_11D_SCAN

bool tgt_if_regulatory_is_11d_offloaded(struct wlan_objmgr_psoc *psoc)

{

	wmi_unified_t wmi_handle = get_wmi_unified_hdl_from_psoc(psoc);

umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h

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

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

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

 * Copyright (c) 2022-2023 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
@@ -152,6 +152,8 @@ 


/* check 31st bit for per channel pno scan config flags support */

#define WLAN_SOC_PNO_SCAN_CONFIG_PER_CHANNEL   0x40000000

	/* check 29th bit for p2p + p2p conc support by fw */

#define WLAN_SOC_EXT_P2P_P2P_CONC_SUPPORT 0x20000000



/* feature_flags */

	/* CONF: ATH FF enabled */