summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-08-17 14:56:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-17 14:56:14 -0700
commit691f7fc77fd59769ab168d51dfaf9638e2cb814f (patch)
tree80ad48a0feb84698c67234c95aad3fa38c61f662
parent41e14ab8aaf69fa18919586820b8cb4322a12c0f (diff)
parent08928d9853a54d704694fc1be5a706a66ca7d3e2 (diff)
downloadandroid_hardware_qcom_wlan-691f7fc77fd59769ab168d51dfaf9638e2cb814f.tar.gz
android_hardware_qcom_wlan-691f7fc77fd59769ab168d51dfaf9638e2cb814f.tar.bz2
android_hardware_qcom_wlan-691f7fc77fd59769ab168d51dfaf9638e2cb814f.zip
Merge "WiFiHAL: memset cap_vendor_data before populating data to it." into wlan-aosp.lnx.2.9.1
-rw-r--r--qcwcn/wifi_hal/wifilogger_diag.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp
index 5e9227b..da397af 100644
--- a/qcwcn/wifi_hal/wifilogger_diag.cpp
+++ b/qcwcn/wifi_hal/wifilogger_diag.cpp
@@ -136,6 +136,7 @@ static wifi_error process_log_extscan_capabilities(hal_info *info,
pRingBufferEntry = (wifi_ring_buffer_entry *)&out_buf[0];
memset(pRingBufferEntry, 0, SCAN_CAP_ENTRY_SIZE);
+ memset(&cap_vendor_data, 0, sizeof(gscan_capabilities_vendor_data_t));
pConnectEvent = (wifi_ring_buffer_driver_connectivity_event *)
(pRingBufferEntry + 1);
@@ -701,6 +702,8 @@ static wifi_error process_roam_event(hal_info *info, u32 id,
roam_candidate_found_vendor_data_t roamCandidateFoundVendata;
pConnectEvent->event = WIFI_EVENT_ROAM_CANDIDATE_FOUND;
pRoamCandidateFound = (wlan_roam_candidate_found_payload_type *)buf;
+ memset(&roamCandidateFoundVendata, 0,
+ sizeof(roam_candidate_found_vendor_data_t));
pTlv = &pConnectEvent->tlvs[0];
pTlv = addLoggerTlv(WIFI_TAG_CHANNEL,
sizeof(pRoamCandidateFound->channel),