1 files changed, 37 insertions, 4 deletions

diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h
index 6754252..55034d1 100644
--- a/include/hardware_legacy/wifi_nan.h
+++ b/include/hardware_legacy/wifi_nan.h
@@ -61,7 +61,7 @@ typedef u32 NanDataPathId;
 #define NAN_ERROR_STR_LEN                       255
 #define NAN_PMK_INFO_LEN                        32
 #define NAN_MAX_SCID_BUF_LEN                    1024
-#define NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN  1024
+#define NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN  2048
 #define NAN_SECURITY_MIN_PASSPHRASE_LEN         8
 #define NAN_SECURITY_MAX_PASSPHRASE_LEN         63
 #define NAN_MAX_CHANNEL_INFO_SUPPORTED          4
@@ -2492,6 +2492,15 @@ typedef struct {
 
     /* Publish or Subscribe Id of an earlier Publish/Subscribe */
     u16 publish_subscribe_id;
+
+    /* configure CSIA (Cipher Suite Information attribute) capability to specify GTK, IGTK, BIGTK
+       are supported or not
+    */
+    u8 csia_capabilities;
+
+    /* configure GTK(Group Transient Key) protection required or not */
+    u8 gtk_protection;
+
 } NanDataPathInitiatorRequest;
 
 /*
@@ -2552,6 +2561,14 @@ typedef struct {
       Discovery MAC addr of the publisher/peer
     */
     u8 peer_disc_mac_addr[NAN_MAC_ADDR_LEN];
+
+    /* configure CSIA (Cipher Suite Information attribute) capability to specify GTK, IGTK, BIGTK
+       are supported or not
+    */
+    u8 csia_capabilities;
+
+    /* configure GTK(Group Transient Key) protection required or not */
+    u8 gtk_protection;
 } NanDataPathIndicationResponse;
 
 /* Sub slot parameters */
@@ -2606,6 +2623,14 @@ typedef struct {
        for setting up the Secure Data Path.
     */
     u8 scid[NAN_MAX_SCID_BUF_LEN];
+
+    /* configure CSIA (Cipher Suite Information attribute) capability to specify GTK, IGTK, BIGTK
+       are supported or not
+    */
+    u8 csia_capabilities;
+
+    /* configure GTK(Group Transient Key) protection required or not */
+    u8 gtk_protection;
 } NanDataPathRequestInd;
 
 /*
@@ -2825,7 +2850,7 @@ typedef struct {
   Initiator side
 */
 typedef struct {
-    /* Publish or Subscribe Id of an earlier Publish/Subscribe */
+    /* Publish instance id generated on Publisher side corresponding to a session */
     u16 publish_subscribe_id;
     /*
       This Id is the Requestor Instance that is passed as
@@ -2898,6 +2923,9 @@ typedef struct {
   NAN pairing bootstrapping initiator request
 */
 typedef struct {
+    /* Publish or Subscribe Id of local Publish/Subscribe */
+    u16 publish_subscribe_id;
+
     /*
        This Id is the Requestor Instance that is passed as
        part of earlier MatchInd/FollowupInd message.
@@ -2926,6 +2954,9 @@ typedef struct {
     u16 sdea_service_specific_info_len;
     u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN];
 
+    /* Indicates that this is comeback Bootstrapping request */
+    u8 comeback;
+
     /* The length of cookie. */
     u32 cookie_length;
 
@@ -2937,9 +2968,11 @@ typedef struct {
  NAN pairing bootstrapping response from responder to a initate request
 */
 typedef struct {
+    /* Publish or Subscribe Id of local Publish/Subscribe */
+    u16 publish_subscribe_id;
 
     /*
-       This Id is the Requestor Instance that is passed as
+       This Id is the Peer Instance that is passed as
        part of earlier MatchInd/FollowupInd message.
     */
     u32 service_instance_id;
@@ -2976,7 +3009,7 @@ typedef struct {
 } NanBootstrappingIndicationResponse;
 
 /*
-  Event indication received on the responder side when a Nan boostrapping session is initiated on
+  Event indication received on the responder side when a Nan bootsrapping session is initiated on
   the Initiator side
 */
 typedef struct {