Merge commit '1a2fc5395e' on to remote branch

Change-Id: I054f67d8792b1eb1e8a181bba4377bf7557dca4b
This commit is contained in:
Eruvaram Kumar Raja Reddy 2024-11-13 11:11:14 +05:30
commit 74bc45b661
5 changed files with 9 additions and 9 deletions

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021, 2024 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
@ -1082,10 +1082,11 @@ void wlan_hdd_sar_timers_reset(struct hdd_context *hdd_ctx)
if (QDF_IS_STATUS_SUCCESS(status))
hdd_nofl_debug("sar safety timer started");
qdf_event_set(&hdd_ctx->sar_safety_req_resp_event);
qdf_delayed_work_stop_sync(&hdd_ctx->sar_safety_unsolicited_work);
hdd_nofl_debug("sar safety unsolicited work stopped");
qdf_event_set(&hdd_ctx->sar_safety_req_resp_event);
}
void wlan_hdd_sar_timers_init(struct hdd_context *hdd_ctx)

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 "T"
#define QWLAN_VERSION_EXTRA "Y"
#define QWLAN_VERSION_BUILD 34
#define QWLAN_VERSIONSTR "2.0.8.34T"
#define QWLAN_VERSIONSTR "2.0.8.34Y"
#endif /* QWLAN_VERSION_H */

View file

@ -27,7 +27,7 @@
*
*
* This file was automatically generated by 'framesc'
* Wed Sep 11 12:49:28 2024 from the following file(s):
* Tue Sep 3 23:04:38 2024 from the following file(s):
*
* dot11f.frms
*

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2024 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
@ -5744,8 +5744,7 @@ static void lim_tx_mgmt_frame(struct mac_context *mac_ctx, uint8_t vdev_id,
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
session->peSessionId, qdf_status));
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pe_err("*** Could not send Auth frame (subType: %d), retCode=%X ***",
fc->subType, qdf_status);
pe_err("Could not send Auth frame, retCode=%X", qdf_status);
mac_ctx->auth_ack_status = LIM_TX_FAILED;
auth_ack_status = SENT_FAIL;
lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_AUTH_ACK_EVENT,

View file

@ -25,7 +25,7 @@
*
*
* This file was automatically generated by 'framesc'
* Wed Sep 11 12:49:28 2024 from the following file(s):
* Tue Sep 3 23:04:38 2024 from the following file(s):
*
* dot11f.frms
*