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

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

Merge 8d7ac7ec on remote branch 

Change-Id: I6d3e4d609372afd0f2971bb39af3d10d9589f777
parents b2214f62 8d7ac7ec

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

+3 −3
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.

 *

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

 * any purpose with or without fee is hereby granted, provided that the
@@ -3630,9 +3631,8 @@ void policy_mgr_init_sap_mandatory_chan(struct wlan_objmgr_psoc *psoc, 
	if (WLAN_REG_IS_5GHZ_CH_FREQ(org_ch_freq)) {

		policy_mgr_debug("channel %hu, sap mandatory chan list enabled",

				 org_ch_freq);

		if (!policy_mgr_get_sap_mandatory_chan_list_len(psoc))

		policy_mgr_init_sap_mandatory_chan_by_band(

				psoc, BIT(REG_BAND_2G));

			psoc, BIT(REG_BAND_2G) | BIT(REG_BAND_5G));

		policy_mgr_add_sap_mandatory_chan(

			psoc, org_ch_freq);

	} else if (WLAN_REG_IS_6GHZ_CHAN_FREQ(org_ch_freq)) {

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

+3 −1
Original line number Diff line number Diff line
@@ -2506,7 +2506,9 @@ policy_mgr_get_sap_mandatory_channel(struct wlan_objmgr_psoc *psoc, 
	}



	sap_new_freq = pcl.pcl_list[0];

	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(sap_ch_freq)) {

	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(sap_ch_freq) ||

	    (WLAN_REG_IS_5GHZ_CH_FREQ(sap_ch_freq) &&

	     WLAN_REG_IS_5GHZ_CH_FREQ(*intf_ch_freq))) {

		for (i = 0; i < pcl.pcl_len; i++) {

			if (pcl.pcl_list[i] == *intf_ch_freq) {

				sap_new_freq = pcl.pcl_list[i];

components/ipa/core/src/wlan_ipa_core.c

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

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

 * any purpose with or without fee is hereby granted, provided that the
@@ -2149,7 +2150,7 @@ void wlan_ipa_handle_multiple_sap_evt(struct wlan_ipa_priv *ipa_ctx, 
		}



		if (!ipa_ctx->ipa_pipes_down)

			wlan_ipa_uc_disable_pipes(ipa_ctx, true);

			wlan_ipa_uc_handle_last_discon(ipa_ctx, true);

	}

}

#endif

components/ipa/core/src/wlan_ipa_main.c

+11 −3
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.

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

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

 * above copyright notice and this permission notice appear in all
@@ -754,6 +754,7 @@ void ipa_fw_rejuvenate_send_msg(struct wlan_objmgr_pdev *pdev) 


void ipa_component_config_update(struct wlan_objmgr_psoc *psoc)

{

	struct device *dev = wlan_psoc_get_qdf_dev(psoc)->dev;

	QDF_STATUS status;



	status = ipa_config_mem_alloc();
@@ -762,8 +763,15 @@ void ipa_component_config_update(struct wlan_objmgr_psoc *psoc) 
		return;

	}



	if (!pld_is_ipa_offload_disabled(dev)) {

		g_ipa_config->ipa_config =

			cfg_get(psoc, CFG_DP_IPA_OFFLOAD_CONFIG);

		ipa_info("IPA ini configuration: 0x%x",

			 g_ipa_config->ipa_config);

	} else {

		g_ipa_config->ipa_config = 0;

		ipa_info("IPA disabled from platform driver");

	}

	g_ipa_config->desc_size =

		cfg_get(psoc, CFG_DP_IPA_DESC_SIZE);

	g_ipa_config->txbuf_count =

components/mlme/core/src/wlan_mlme_main.c

+2 −1
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.

 * 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
@@ -1884,6 +1884,7 @@ static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc, 
		cfg_get(psoc, CFG_POST_INACTIVITY_ROAM_SCAN_PERIOD);

	lfr->fw_akm_bitmap = 0;

	lfr->enable_ft_im_roaming = cfg_get(psoc, CFG_FT_IM_ROAMING);

	lfr->enable_ft_over_ds = !ENABLE_FT_OVER_DS;



	mlme_init_roam_offload_cfg(psoc, lfr);

	mlme_init_ese_cfg(psoc, lfr);