aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaewan Kim <jaewan@google.com>2023-02-03 09:22:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-03 09:22:59 +0000
commit5a6016de1a5d56d548c473c542ec25fa8d27c0d5 (patch)
tree607216548babd90cf5addd26aaa0720530d1c853
parent3f6b6630805a3139c6bbfbab1b810fc92c08cc0b (diff)
parent33448037f466aacaed518b1b611f9c25d3547aa7 (diff)
downloadwmediumd-5a6016de1a5d56d548c473c542ec25fa8d27c0d5.tar.gz
Report LCI and/or CIVICLOC when requested am: 080dd3504e am: 33448037f4
Original change: https://android-review.googlesource.com/c/platform/external/wmediumd/+/2419023 Change-Id: If59e39f6d7462e25aea8ed214e10083247773734 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--wmediumd/wmediumd.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/wmediumd/wmediumd.c b/wmediumd/wmediumd.c
index 5fcf33e..5f456a3 100644
--- a/wmediumd/wmediumd.c
+++ b/wmediumd/wmediumd.c
@@ -991,6 +991,16 @@ static int send_pmsr_result_ftm(struct nl_msg *msg,
return -ENOMEM;
}
+ if (req->request_lci && receiver->lci) {
+ nla_put_string(msg, NL80211_PMSR_FTM_RESP_ATTR_LCI,
+ receiver->lci);
+ }
+
+ if (req->request_civicloc && receiver->civicloc) {
+ nla_put_string(msg, NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC,
+ receiver->civicloc);
+ }
+
out:
if (ftm)
nla_nest_end(msg, ftm);