commit 4cc0f0993c86526e5f8a1a34bc05e15703732330
author Ajit Vaishya <ajitv@codeaurora.org> Thu Jun 13 22:57:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 22:57:00 2019 -0700
tree b93a9145fa16af7796fa18e147bac945b857712d
parent 863a4106fdee2b2381eb4399f3d6b42b0d81452e
parent 32886cca7ac0af6c75a39184dfbee82ea5ac69ad

Wifi-hal: TX Per Packet stats for V2 version.
am: 32886cca7a

Change-Id: I0c32710c95c4db6c881525e5c7ceb8a26804e33c

qcwcn/wifi_hal/wifilogger_diag.cpp

diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp
index 2e01fe0..12aa69f 100644
--- a/qcwcn/wifi_hal/wifilogger_diag.cpp
+++ b/qcwcn/wifi_hal/wifilogger_diag.cpp
@@ -2394,27 +2394,7 @@
 {
     wifi_error status = WIFI_SUCCESS;
 
-    if (pkt_stats_header->log_type == PKTLOG_TYPE_RX_STAT) {
-        /* Ignore the event if it doesn't carry RX descriptor */
-        if (pkt_stats_header->flags & PKT_INFO_FLG_RX_RXDESC_MASK)
-            status = parse_rx_stats_v2(info,
-                                    (u8 *)(pkt_stats_header + 1),
-                                    pkt_stats_header->size);
-        else
-            status = WIFI_SUCCESS;
-    } else if (pkt_stats_header->log_type == PKTLOG_TYPE_PKT_DUMP_V2) {
-        pthread_mutex_lock(&info->pkt_fate_stats_lock);
-        if (info->fate_monitoring_enabled) {
-            if (pkt_stats_header->flags & PKT_INFO_FLG_PKT_DUMP_V2)
-                status = parse_pkt_fate_stats(info,
-                                              (u8 *)pkt_stats_header + sizeof(wh_pktlog_hdr_v2_t),
-                                              pkt_stats_header->size);
-            else
-                status = WIFI_SUCCESS;
-        } else
-            status = WIFI_SUCCESS;
-        pthread_mutex_unlock(&info->pkt_fate_stats_lock);
-    } else if (pkt_stats_header->log_type == PKTLOG_TYPE_PKT_SW_EVENT) {
+    if (pkt_stats_header->log_type == PKTLOG_TYPE_PKT_SW_EVENT) {
         status = parse_stats_sw_event(info, pkt_stats_header);
     } else
         ALOGE("%s: invalid log_type %d",__FUNCTION__, pkt_stats_header->log_type);
@@ -2499,10 +2479,7 @@
            }
         }
 
-        if (info->pkt_log_ver == PKT_LOG_V2) {
-            data += (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
-            buflen -= (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
-        } else {
+        if (info->pkt_log_ver == PKT_LOG_V1) {
            if (pkt_stats_header->flags & PKT_INFO_FLG_PKT_DUMP_V2){
                data += (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
                buflen -= (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
@@ -2510,6 +2487,9 @@
                data += (sizeof(wh_pktlog_hdr_t) + pkt_stats_header->size);
                buflen -= (sizeof(wh_pktlog_hdr_t) + pkt_stats_header->size);
            }
+        } else if (info->pkt_log_ver == PKT_LOG_V2) {
+            data += (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
+            buflen -= (sizeof(wh_pktlog_hdr_v2_t) + pkt_stats_header->size);
         }
     } while (buflen > 0);