diff options
| author | Ajit Vaishya <ajitv@codeaurora.org> | 2021-11-24 17:10:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-24 17:10:23 +0000 |
| commit | e709610cfda25928d5e1cc4b01d1917bf9168a6a (patch) | |
| tree | 56e6bd9bfbae452e2ec80c9456bafd9585572716 | |
| parent | 11ccfc689fdc51b981ce3d7ea338f52ba8c8bfe5 (diff) | |
| parent | df6958b32009eff68cf45e0b994636fdd8e5fd7f (diff) | |
| download | wlan-e709610cfda25928d5e1cc4b01d1917bf9168a6a.tar.gz | |
Wifi-Hal: Validate TX rate code before parsing it am: ef79d4cb49 am: df6958b320
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/16191795
Change-Id: I79d7182688be17cb6ff2a4a4b137bca72526a82a
| -rw-r--r-- | qcwcn/wifi_hal/pkt_stats.h | 1 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/wifilogger_diag.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qcwcn/wifi_hal/pkt_stats.h b/qcwcn/wifi_hal/pkt_stats.h index 7cc64b8..d4348cd 100644 --- a/qcwcn/wifi_hal/pkt_stats.h +++ b/qcwcn/wifi_hal/pkt_stats.h @@ -49,6 +49,7 @@ #define PKTLOG_TYPE_MAX 12 #define BW_OFFSET 8 #define INVALID_RSSI 255 +#define INVALID_RATE_CODE 0xff /* Based on pkt log V2, this type of event will triggered */ #define PKTLOG_TYPE_PKT_SW_EVENT 10 diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp index 436a42b..bdc9c7f 100644 --- a/qcwcn/wifi_hal/wifilogger_diag.cpp +++ b/qcwcn/wifi_hal/wifilogger_diag.cpp @@ -2338,7 +2338,8 @@ static wifi_error parse_stats_sw_event(hal_info *info, node_pkt_t.qos_ctrl = *((u8*)(node_pkt_data + QOS_CTRL_OFFSET)); rb_pkt_stats->tid = node_pkt_t.qos_ctrl & 0xF; rb_pkt_stats->MCS = get_tx_mcs_v1(node_pkt_data); - rb_pkt_stats->last_transmit_rate = get_rate_v1(rb_pkt_stats->MCS); + if ((rb_pkt_stats->MCS & INVALID_RATE_CODE) != INVALID_RATE_CODE) + rb_pkt_stats->last_transmit_rate = get_rate_v1(rb_pkt_stats->MCS); node_pkt_t.bmap_failed = *((u64*)(node_pkt_data + BMAP_FAILED_OFFSET)); node_pkt_t.bmap_enqueued = *((u64*)(node_pkt_data + BMAP_ENQUEUED_OFFSET)); |