From 99bc15a8f224c44fa2b8c52f1a448625c6f62c7a Mon Sep 17 00:00:00 2001 From: jiad Date: Mon, 22 Jan 2018 15:37:03 +0800 Subject: [PATCH] qcacmn: Fix WMI mgmt cmd tx comp record wmi_mgmt_cmd_record is used to add WMI mgmt cmd record. But mgmt cmd tx comp record is missing due to mismatch of is_management_record. Fix is to change is_management_record WMI cmd id to match those who call wmi_mgmt_cmd_record. In wmi_unified_cmd_send, mgmt cmd record add is no longer needed since already added in wmi_mgmt_cmd_record. Change-Id: I41daf428ac0848dabaf4d87e3ecb7dca5e1c2774 CRs-Fixed: 2168104 --- wmi/src/wmi_unified.c | 14 +++++++------- wmi/src/wmi_unified_tlv.c | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index 06ee8aa9bb..1e13d85ef5 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -1427,13 +1427,13 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, #ifdef WMI_INTERFACE_EVENT_LOGGING if (wmi_handle->log_info.wmi_logging_enable) { qdf_spin_lock_bh(&wmi_handle->log_info.wmi_record_lock); - /*Record 16 bytes of WMI cmd data - - * * exclude TLV and WMI headers */ - if (wmi_handle->ops->is_management_record(cmd_id)) { - WMI_MGMT_COMMAND_RECORD(wmi_handle, cmd_id, - qdf_nbuf_data(buf) + - wmi_handle->log_info.buf_offset_command); - } else { + /* + * Record 16 bytes of WMI cmd data - + * exclude TLV and WMI headers + * + * WMI mgmt command already recorded in wmi_mgmt_cmd_record + */ + if (wmi_handle->ops->is_management_record(cmd_id) == false) { WMI_COMMAND_RECORD(wmi_handle, cmd_id, qdf_nbuf_data(buf) + wmi_handle->log_info.buf_offset_command); diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index ea7a651c90..b62fa55f0f 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -20058,8 +20058,11 @@ static QDF_STATUS extract_peer_delete_response_event_tlv(wmi_unified_t wmi_hdl, static bool is_management_record_tlv(uint32_t cmd_id) { - if (cmd_id == WMI_MGMT_TX_COMPLETION_EVENTID) + if ((cmd_id == WMI_MGMT_TX_COMPLETION_EVENTID) || + (cmd_id == WMI_MGMT_TX_SEND_CMDID) || + (cmd_id == WMI_OFFCHAN_DATA_TX_SEND_CMDID)) { return true; + } return false; }