commit 1da29541bcc6e2f632d3ca1ed3295653000cd7a0
author Etan Cohen <etancohen@google.com> Thu Mar 09 23:13:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 09 23:13:29 2017 +0000
tree b069bf76bcb4869f054120873c402164e492714a
parent ea2adcc23aa75b8096f30b3a2d20817fff3dec1c
parent 8747f478d1d989b95776d35fbf780c1e0553d61c

Merge "[AWARE]: Add range report in SDEA params"

include/hardware_legacy/wifi_nan.h

diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h
index 7d7dd34..c7d482a 100644
--- a/include/hardware_legacy/wifi_nan.h
+++ b/include/hardware_legacy/wifi_nan.h
@@ -285,6 +285,11 @@
        if ranging is enabled on disabled
     */
     NanRangingState ranging_state;
+    /*
+      Enable/Disable Ranging report,
+      when configured NanRangeReportInd received
+    */
+    NanRangeReport range_report;
 } NanSdeaCtrlParams;
 
 /*
@@ -1036,9 +1041,6 @@
     /* Enable/disable NAN serivce Ranging auto response mode */
     NanRangingAutoResponse ranging_auto_response;
 
-    /* Enable/Disable Ranging report, when configured NanRangeReportInd received */
-    NanRangeReport range_report;
-
     /*
       When the ranging_auto_response_cfg is not set, NanRangeRequestInd is
       received. Nan Range Response to Peer MAC Addr is notified to indicate
@@ -1203,9 +1205,6 @@
     /* Enable/disable NAN serivce Ranging auto response mode */
     NanRangingAutoResponse ranging_auto_response;
 
-    /* Enable/Disable Ranging report, when configured NanRangeReportInd received */
-    NanRangeReport range_report;
-
     /*
       When the ranging_auto_response_cfg is not set, NanRangeRequestInd is
       received. Nan Range Response to Peer MAC Addr is notified to indicate