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

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

Merge 5360717d on remote branch 

Change-Id: Icb5de366ade1a53efc140aa01d430089263e3b77
parents d2efd2c6 5360717d

Kbuild

+2 −1
Original line number Original line Diff line number Diff line
@@ -2653,6 +2653,7 @@ WLAN_TWT_SAP_STA_COUNT ?= 32 
ccflags-y += -DWLAN_TWT_SAP_STA_COUNT=$(WLAN_TWT_SAP_STA_COUNT)

ccflags-y += -DWLAN_TWT_SAP_STA_COUNT=$(WLAN_TWT_SAP_STA_COUNT)

endif

endif





cppflags-$(CONFIG_ENABLE_LOW_POWER_MODE) += -DCONFIG_ENABLE_LOW_POWER_MODE

cppflags-$(CONFIG_WLAN_TWT_SAP_PDEV_COUNT) += -DWLAN_TWT_AP_PDEV_COUNT_NUM_PHY

cppflags-$(CONFIG_WLAN_TWT_SAP_PDEV_COUNT) += -DWLAN_TWT_AP_PDEV_COUNT_NUM_PHY

cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL

cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL

cppflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED

cppflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED
@@ -3732,7 +3733,7 @@ cppflags-$(CONFIG_MORE_TX_DESC) += -DTX_TO_NPEERS_INC_TX_DESCS 




ccflags-$(CONFIG_HASTINGS_BT_WAR) += -DHASTINGS_BT_WAR

ccflags-$(CONFIG_HASTINGS_BT_WAR) += -DHASTINGS_BT_WAR





cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHIF_CONFIG_SLUB_DEBUG_ON

cppflags-y += -DHIF_CONFIG_SLUB_DEBUG_ON

cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHAL_CONFIG_SLUB_DEBUG_ON

cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHAL_CONFIG_SLUB_DEBUG_ON





ccflags-$(CONFIG_FOURTH_CONNECTION) += -DFEATURE_FOURTH_CONNECTION

ccflags-$(CONFIG_FOURTH_CONNECTION) += -DFEATURE_FOURTH_CONNECTION

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

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

/*

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

 * Copyright (c) 2012-2021 The Linux Foundation. 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

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

 * any purpose with or without fee is hereby granted, provided that the

 * any purpose with or without fee is hereby granted, provided that the
@@ -201,15 +202,15 @@ void policy_mgr_decr_session_set_pcl(struct wlan_objmgr_psoc *psoc, 




			/* Send RSO stop before sending set pcl command */

			/* Send RSO stop before sending set pcl command */

			pm_ctx->sme_cbacks.sme_rso_stop_cb(

			pm_ctx->sme_cbacks.sme_rso_stop_cb(

						mac_handle, session_id,

						mac_handle, vdev_id,

						REASON_DRIVER_DISABLED,

						REASON_DRIVER_DISABLED,

						RSO_SET_PCL);

						RSO_SET_PCL);





			policy_mgr_set_pcl_for_existing_combo(psoc, PM_STA_MODE,

			policy_mgr_set_pcl_for_existing_combo(psoc, PM_STA_MODE,

							      session_id);

							      vdev_id);





			pm_ctx->sme_cbacks.sme_rso_start_cb(

			pm_ctx->sme_cbacks.sme_rso_start_cb(

					mac_handle, session_id,

					mac_handle, vdev_id,

					REASON_DRIVER_ENABLED,

					REASON_DRIVER_ENABLED,

					RSO_SET_PCL);

					RSO_SET_PCL);

		}

		}

components/mlme/core/src/wlan_mlme_twt_api.c

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

/*

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

 * Copyright (c) 2018-2021 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

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

 * purpose with or without fee is hereby granted, provided that the above

 * purpose with or without fee is hereby granted, provided that the above
@@ -187,7 +188,7 @@ QDF_STATUS mlme_init_twt_context(struct wlan_objmgr_psoc *psoc, 
	peer = wlan_objmgr_get_peer_by_mac(psoc, peer_mac->bytes,

	peer = wlan_objmgr_get_peer_by_mac(psoc, peer_mac->bytes,

					   WLAN_MLME_NB_ID);

					   WLAN_MLME_NB_ID);

	if (!peer) {

	if (!peer) {

		mlme_legacy_err("Peer object not found");

		mlme_legacy_debug("Peer object not found");

		return QDF_STATUS_E_FAILURE;

		return QDF_STATUS_E_FAILURE;

	}

	}

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,7 @@ enum roam_invoke_source_entity { 
struct mlme_roam_after_data_stall {

struct mlme_roam_after_data_stall {

	bool roam_invoke_in_progress;

	bool roam_invoke_in_progress;

	enum roam_invoke_source_entity source;

	enum roam_invoke_source_entity source;

	struct qdf_mac_addr mac_addr;

};

};





/**

/**

components/nan/core/src/nan_api.c

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

/*

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

 * Copyright (c) 2016-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

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

 * any purpose with or without fee is hereby granted, provided that the

 * any purpose with or without fee is hereby granted, provided that the
@@ -410,10 +411,36 @@ QDF_STATUS nan_psoc_disable(struct wlan_objmgr_psoc *psoc) 
	return QDF_STATUS_SUCCESS;

	return QDF_STATUS_SUCCESS;

}

}





static bool

wlan_is_nan_allowed_on_6ghz_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)

{

	QDF_STATUS status;

	struct regulatory_channel chan_list[NUM_6GHZ_CHANNELS];

	uint16_t i;



	status = wlan_reg_get_6g_ap_master_chan_list(pdev,

						     REG_VERY_LOW_POWER_AP,

						     chan_list);



	for (i = 0; i < NUM_6GHZ_CHANNELS; i++) {

		if ((freq == chan_list[i].center_freq) &&

		    (chan_list[i].state == CHANNEL_STATE_ENABLE))

			return true;

	}



	return false;

}



bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)

bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)

{

{

	bool nan_allowed = true;

	bool nan_allowed = true;





	/* Check for 6GHz channels */

	if (wlan_reg_is_6ghz_chan_freq(freq)) {

		nan_allowed = wlan_is_nan_allowed_on_6ghz_freq(pdev, freq);

		return nan_allowed;

	}



	/* Check for SRD channels */

	/* Check for SRD channels */

	if (wlan_reg_is_etsi13_srd_chan_for_freq(pdev, freq))

	if (wlan_reg_is_etsi13_srd_chan_for_freq(pdev, freq))

		wlan_mlme_get_srd_master_mode_for_vdev(wlan_pdev_get_psoc(pdev),

		wlan_mlme_get_srd_master_mode_for_vdev(wlan_pdev_get_psoc(pdev),