summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-04-22 09:22:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-22 09:22:34 +0000
commit63511e73e2c6446c90787905f6d8b0419cf0e3a1 (patch)
tree6764eff86b364b59084567a9b1b0dc11b9a8babc
parent9c1cdc24ed33b1543b3daadc7aec1b89570a8407 (diff)
parent79464da5e668de737368f899dac7d730fb8aacc5 (diff)
downloadwlan-63511e73e2c6446c90787905f6d8b0419cf0e3a1.tar.gz
Merge "HAL: Added attributes for PKTID to the event handler for GOOGLE_FILE_DUMP_EVENT" into tm-dev am: 79464da5e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/17887004 Change-Id: I57581453e6f88969772e626f27748e874ad4d909 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xbcmdhd/wifi_hal/wifi_logger.cpp8
1 files changed, 6 insertions, 2 deletions
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 @@ public:
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 @@ public:
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));