summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-02-05 19:50:33 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-02-05 19:50:33 -0800
commit99d6381fb6d139529e69b079baf4ba1ffe556cb1 (patch)
tree1646457721917bb82ec8caec80ac1cff7b362b76
parentbe96f287f8fdc3ceb840e7f7ac4c2c4b94dd3ea7 (diff)
parent923c48152572a65bb7469f30d2df8ea3238dfdbb (diff)
downloadbcm4389-99d6381fb6d139529e69b079baf4ba1ffe556cb1.tar.gz
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udcandroid-u-preview-2_r0.2android-gs-raviole-5.10-u-preview-2
SBMerger: 478053055 Change-Id: I93b0f7a653e557b26f41b2ab154ddcbaaa65addc Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--dhd_debug.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dhd_debug.c b/dhd_debug.c
index 79878a4..a7f4933 100644
--- a/dhd_debug.c
+++ b/dhd_debug.c
@@ -1119,11 +1119,11 @@ dhd_dbg_msgtrace_log_parser(dhd_pub_t *dhdp, void *event_data,
* event log buffer. Refer to event log buffer structure in
* event_log.h
*/
+ logset = (ltoh32(*((uint32 *)(data + 4))) & EVENT_LOG_SETID_MASK);
+
DHD_MSGTRACE_LOG(("EVENT_LOG_HDR[0x%x]: Set: 0x%08x length = %d\n",
- ltoh16(*((uint16 *)(data+2))), ltoh32(*((uint32 *)(data + 4))),
- ltoh16(*((uint16 *)(data)))));
+ ltoh16(*((uint16 *)(data+2))), logset, ltoh16(*((uint16 *)(data)))));
- logset = ltoh32(*((uint32 *)(data + 4)));
block_hdr_len = ltoh16(*((uint16 *)(data)));
if (logset >= event_log_max_sets) {