Snap for 10103804 from 11ea8d4853d264e6ae508570870301da66173cb7 to mainline-tzdata5-release
Change-Id: I88190489da35769cc77163b4e4f0a58899a42e36
diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h
index d2bb621..6754252 100644
--- a/include/hardware_legacy/wifi_nan.h
+++ b/include/hardware_legacy/wifi_nan.h
@@ -40,9 +40,9 @@
typedef u32 NanDataPathId;
#define NAN_MAC_ADDR_LEN 6
-#define NAN_MAJOR_VERSION 2
+#define NAN_MAJOR_VERSION 4
#define NAN_MINOR_VERSION 0
-#define NAN_MICRO_VERSION 1
+#define NAN_MICRO_VERSION 0
#define NAN_MAX_SOCIAL_CHANNELS 3
/* NAN Maximum Lengths */
@@ -1561,6 +1561,12 @@
*/
u16 sdea_service_specific_info_len;
u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN];
+
+ /*
+ Add shared key descriptor attribute to the Followup request when the
+ flag is set
+ */
+ u8 shared_key_desc_flag;
} NanTransmitFollowupRequest;
/*
@@ -2906,6 +2912,20 @@
/* Proposed bootstrapping method */
u16 request_bootstrapping_method;
+ /*
+ Sequence of values which further specify the published service beyond
+ the service name.
+ */
+ u16 service_specific_info_len;
+ u8 service_specific_info[NAN_MAX_SERVICE_SPECIFIC_INFO_LEN];
+
+ /*
+ Sequence of values indicating the service specific info in SDEA
+ Used for service managed bootstrapping method
+ */
+ u16 sdea_service_specific_info_len;
+ u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN];
+
/* The length of cookie. */
u32 cookie_length;
@@ -2924,10 +2944,35 @@
*/
u32 service_instance_id;
+ /* Discovery MAC addr of the peer/initiator */
+ u8 peer_disc_mac_addr[NAN_MAC_ADDR_LEN];
+
+ /*
+ Sequence of values which further specify the published service beyond
+ the service name.
+ */
+ u16 service_specific_info_len;
+ u8 service_specific_info[NAN_MAX_SERVICE_SPECIFIC_INFO_LEN];
+
+ /*
+ Sequence of values indicating the service specific info in SDEA
+ Used for service managed bootstrapping method
+ */
+ u16 sdea_service_specific_info_len;
+ u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN];
/* Response Code indicating ACCEPT/REJECT */
NanBootstrappingResponseCode rsp_code;
+ /* The delay of bootstrapping in seconds */
+ u32 come_back_delay;
+
+ /* The length of cookie. */
+ u32 cookie_length;
+
+ /* Cookie for the follow up response */
+ u8 cookie[];
+
} NanBootstrappingIndicationResponse;
/*
