commit 9437baca50d636f2f88f09e36dd4669e1bd4828a
author The Android Automerger <android-build@google.com> Fri Sep 25 01:04:02 2015 -0700
committer The Android Automerger <android-build@google.com> Fri Sep 25 01:04:02 2015 -0700
tree 2e6c3f171bc829a2272e53d5d9e5004678c21c89
parent 3a6288afe9317768eef26f1e69e5fdbd97cd396e
parent 0f5735c614510409f9771e939d6f41d5e3f6e8f2

merge in mnc-dr-release history after reset to mnc-dr-dev

qcwcn/wifi_hal/wifilogger_diag.cpp

diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp
index 17443cf..742bc98 100644
--- a/qcwcn/wifi_hal/wifilogger_diag.cpp
+++ b/qcwcn/wifi_hal/wifilogger_diag.cpp
@@ -904,10 +904,9 @@
             case WLAN_DIAG_TYPE_MSG:
             {
                 /* Length field is only one byte for WLAN_DIAG_TYPE_MSG */
-                payloadlen = diag_msg_hdr->u.msg_hdr.payload_len +
-                             sizeof(fw_diag_msg_hdr_t);
+                payloadlen = diag_msg_hdr->u.msg_hdr.payload_len;
                 process_firmware_prints(info, (u8 *)diag_msg_hdr,
-                                        payloadlen);
+                                       payloadlen + sizeof(fw_diag_msg_hdr_t));
             }
             break;
             default: