diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-04-22 10:11:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-22 10:11:04 +0000 |
| commit | fbd702fb9f711dca356e4b1824748e6b69103772 (patch) | |
| tree | 6764eff86b364b59084567a9b1b0dc11b9a8babc | |
| parent | 4acc41e28b87e993a8774f6ddb2513ef32650788 (diff) | |
| parent | 7be3e13264aa312f929b42a970bc09956b145a8b (diff) | |
| download | wlan-fbd702fb9f711dca356e4b1824748e6b69103772.tar.gz | |
Merge "HAL: Added attributes for PKTID to the event handler for GOOGLE_FILE_DUMP_EVENT" into tm-dev am: 79464da5e6 am: 7be3e13264
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/17887004
Change-Id: I9a6e2f9e34b3ba6fae48be333d7c5ed2e7eba7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | bcmdhd/wifi_hal/wifi_logger.cpp | 8 |
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)); |