commit eee11808a20bbc75dd075dcf2fa146da95615f16
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 22 09:50:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 22 09:50:42 2022 +0000
tree 6764eff86b364b59084567a9b1b0dc11b9a8babc
parent 88f97d0972f25bc6706ce98f7e4056f21ed73c36
parent 437ec52ece07d8c95ac0572a627e792b2e82c3f6

Merge "HAL: Added attributes for PKTID to the event handler for GOOGLE_FILE_DUMP_EVENT" into tm-dev am: 79464da5e6 am: 437ec52ece

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/17887004

Change-Id: I647301228b9231123e17fcbbace9f7614e35d96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bcmdhd/wifi_hal/wifi_logger.cpp

diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp
index 9ff65bc..1ee9661 100755
--- a/bcmdhd/wifi_hal/wifi_logger.cpp
+++ b/bcmdhd/wifi_hal/wifi_logger.cpp
@@ -1676,7 +1676,9 @@
                 case DUMP_BUF_ATTR_COOKIE:
                 case DUMP_BUF_ATTR_FLOWRING_DUMP:
                 case DUMP_BUF_ATTR_STATUS_LOG:
-                case DUMP_BUF_ATTR_RTT_LOG: {
+                case DUMP_BUF_ATTR_RTT_LOG:
+                case DUMP_BUF_ATTR_PKTID_MAP_LOG:
+                case DUMP_BUF_ATTR_PKTID_UNMAP_LOG: {
                     if (it.get_u32()) {
                         ALOGE("Copying data to userspace failed, status = %d\n", it.get_u32());
                         return WIFI_ERROR_UNKNOWN;
@@ -1800,7 +1802,9 @@
                     case DUMP_LEN_ATTR_COOKIE:
                     case DUMP_LEN_ATTR_FLOWRING_DUMP:
                     case DUMP_LEN_ATTR_STATUS_LOG:
-                    case DUMP_LEN_ATTR_RTT_LOG: {
+                    case DUMP_LEN_ATTR_RTT_LOG:
+                    case DUMP_LEN_ATTR_PKTID_MAP_LOG:
+                    case DUMP_LEN_ATTR_PKTID_UNMAP_LOG: {
                         mActualBuffSize = it.get_u32();
                         DUMP_DEBUG(("len attr %s, len %d\n",
                             EWP_EventAttrToString(attr), mActualBuffSize));