Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add bootstrapping_instance_id to make this value more clear" into main

Browse Source
This commit is contained in:
Nate Jiang
2024-08-23 20:17:19 +00:00
committed by Android (Google) Code Review
parent be0551d9bc 99ce358cb8
commit 76fa374bc9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/aidl/default/aidl_struct_util.cpp
View File

@@ -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<uint8_t>(aidl_request.discoverySessionId);

10
wifi/legacy_headers/include/hardware_legacy/wifi_nan.h
View File

@@ -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];