From 99ce358cb8b75429780c5864fd2652ed742b23d1 Mon Sep 17 00:00:00 2001 From: qiangjiang Date: Wed, 21 Aug 2024 21:46:46 +0000 Subject: [PATCH] Add bootstrapping_instance_id to make this value more clear Bug: 354820259 Test: TH Change-Id: Idf793f42c21cb395fac749c1f71d29ce8e95aa52 --- wifi/aidl/default/aidl_struct_util.cpp | 1 + wifi/legacy_headers/include/hardware_legacy/wifi_nan.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index d82450e348..d99edaab9b 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -3394,6 +3394,7 @@ bool convertAidlNanBootstrappingIndicationResponseToLegacy( *legacy_request = {}; legacy_request->service_instance_id = aidl_request.bootstrappingInstanceId; + legacy_request->bootstrapping_instance_id = aidl_request.bootstrappingInstanceId; legacy_request->rsp_code = aidl_request.acceptRequest ? NAN_BOOTSTRAPPING_REQUEST_ACCEPT : NAN_BOOTSTRAPPING_REQUEST_REJECT; legacy_request->publish_subscribe_id = static_cast(aidl_request.discoverySessionId); diff --git a/wifi/legacy_headers/include/hardware_legacy/wifi_nan.h b/wifi/legacy_headers/include/hardware_legacy/wifi_nan.h index 55034d131e..4e490d98d0 100644 --- a/wifi/legacy_headers/include/hardware_legacy/wifi_nan.h +++ b/wifi/legacy_headers/include/hardware_legacy/wifi_nan.h @@ -2972,11 +2972,17 @@ typedef struct { u16 publish_subscribe_id; /* - This Id is the Peer Instance that is passed as - part of earlier MatchInd/FollowupInd message. + Same as the bootstrapping_instance_id */ u32 service_instance_id; + /* + Unique Instance Id corresponding to a service/session. + This is similar to the publish_id generated on the + publisher side + */ + u32 bootstrapping_instance_id; + /* Discovery MAC addr of the peer/initiator */ u8 peer_disc_mac_addr[NAN_MAC_ADDR_LEN];