Merge b6c8048d82 on remote branch

Change-Id: I0fc0aaf8040e7db294d6db8e337c04b22b676b86
This commit is contained in:
Linux Build Service Account 2025-04-29 05:15:22 -07:00
commit b5b486ce66
5 changed files with 14 additions and 11 deletions

View file

@ -32,9 +32,9 @@
#define QWLAN_VERSION_MAJOR 2
#define QWLAN_VERSION_MINOR 0
#define QWLAN_VERSION_PATCH 8
#define QWLAN_VERSION_EXTRA "Z"
#define QWLAN_VERSION_BUILD 34
#define QWLAN_VERSION_EXTRA "A"
#define QWLAN_VERSION_BUILD 35
#define QWLAN_VERSIONSTR "2.0.8.34Z"
#define QWLAN_VERSIONSTR "2.0.8.35A"
#endif /* QWLAN_VERSION_H */

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2024-2025 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
@ -140,6 +140,7 @@ struct obss_detection_cfg {
* @prev_auth_seq_num: Sequence number of previously received auth frame to
* detect duplicate frames.
* @prev_auth_mac_addr: mac_addr of the sta correspond to @prev_auth_seq_num
* @cal_tpc_post_csa: Recalculate tx power power csa
*/
struct pe_session {
/* To check session table is in use or free */
@ -580,6 +581,7 @@ struct pe_session {
uint32_t dfs_regdomain;
uint8_t ap_defined_power_type_6g;
uint8_t best_6g_power_type;
bool cal_tpc_post_csa;
};
/*-------------------------------------------------------------------------

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2025 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 +1885,7 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
err:
qdf_mem_free(csa_params);
session_entry->cal_tpc_post_csa = true;
}
/*--------------------------------------------------------------------------

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2025 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
@ -704,8 +704,9 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
}
if ((ap_constraint_change && local_constraint) ||
(tpe_change && !skip_tpe)) {
(tpe_change && !skip_tpe) || session->cal_tpc_post_csa) {
lim_calculate_tpc(mac_ctx, session);
session->cal_tpc_post_csa = false;
if (tx_ops->set_tpc_power)
tx_ops->set_tpc_power(mac_ctx->psoc,

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2025 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
@ -708,7 +708,6 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
}
stats_ext_info = param_buf->fixed_param;
buf_ptr = (uint8_t *)stats_ext_info;
alloc_len = sizeof(tSirStatsExtEvent);
alloc_len += stats_ext_info->data_len;
@ -725,7 +724,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
if (!stats_ext_event)
return -ENOMEM;
buf_ptr += sizeof(wmi_stats_ext_event_fixed_param) + WMI_TLV_HDR_SIZE;
buf_ptr = (uint8_t *)param_buf->data;
stats_ext_event->vdev_id = stats_ext_info->vdev_id;
stats_ext_event->event_data_len = stats_ext_info->data_len;
@ -775,7 +774,6 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
}
stats_ext_info = param_buf->fixed_param;
buf_ptr = (uint8_t *)stats_ext_info;
alloc_len = sizeof(tSirStatsExtEvent);
alloc_len += stats_ext_info->data_len;
@ -791,7 +789,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
if (!stats_ext_event)
return -ENOMEM;
buf_ptr += sizeof(wmi_stats_ext_event_fixed_param) + WMI_TLV_HDR_SIZE;
buf_ptr = (uint8_t *)param_buf->data;
stats_ext_event->vdev_id = stats_ext_info->vdev_id;
stats_ext_event->event_data_len = stats_ext_info->data_len;