summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-07 01:28:12 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-07 01:28:12 +0000
commit1b4cc57f46778188ad64cc79a2a6a4a9102b7c48 (patch)
tree64701e60bb079e2c2f4af949c4646f5689535d7f
parentd9463d5269ba8c1a676d2f817f720c108aae9a63 (diff)
parent81d338f8c2bfa659a466533778cbb29e71bc840b (diff)
downloadwlan-1b4cc57f46778188ad64cc79a2a6a4a9102b7c48.tar.gz
Snap for 9899688 from 81d338f8c2bfa659a466533778cbb29e71bc840b to udc-d1-release
Change-Id: I8d9dba4b847d274fb09889da4449465ea8d2d2c1
-rw-r--r--bcmdhd/wifi_hal/rtt.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp
index 202fb33..819364a 100644
--- a/bcmdhd/wifi_hal/rtt.cpp
+++ b/bcmdhd/wifi_hal/rtt.cpp
@@ -577,7 +577,7 @@ public:
} else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_FREQ) {
channel = it2.get_u32();
if (rttResults[currentIdx] == NULL) {
- ALOGE("Not allocated\n");
+ ALOGE("Not allocated, currentIdx %d\n", currentIdx);
break;
}
if (!channel) {
@@ -590,7 +590,7 @@ public:
} else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_BW) {
bw = (wifi_rtt_bw)it2.get_u32();
if (rttResults[currentIdx] == NULL) {
- ALOGE("Not allocated\n");
+ ALOGE("Not allocated, currentIdx %d\n", currentIdx);
break;
}
rttResults[currentIdx]->packet_bw = bw;
@@ -665,7 +665,7 @@ public:
memcpy(&rtt_result_v2->rtt_result,
(wifi_rtt_result *)rtt_results_v1, RTT_RESULT_V1_SIZE);
if (!channel) {
- rtt_result_v2->frequency = WIFI_CHAN_WIDTH_INVALID;
+ rtt_result_v2->frequency = UNSPECIFIED;
}
/* Copy the optional data to new struct */
@@ -706,7 +706,8 @@ public:
rtt_results_v1->distance_mm / 10,
rtt_results_v1->burst_duration,
rtt_results_v1->negotiated_burst_num);
- nextidx = currentIdx++;
+ nextidx = currentIdx;
+ nextidx++;
}
}
}