From: Etan Cohen <etancohen@google.com>
Date: Tue, 21 Feb 2017 16:32:19 +0000 (+0000)
Subject: Merge "[AWARE]: Configure ranging on discovery sessions"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=427212dafe8473aa509a09c00fcc15943041f29e;p=android-x86%2Fhardware-libhardware_legacy.git

Merge "[AWARE]: Configure ranging on discovery sessions"
---

427212dafe8473aa509a09c00fcc15943041f29e
diff --cc include/hardware_legacy/wifi_nan.h
index 09c4be1,c9e7b41..751b4b5
--- a/include/hardware_legacy/wifi_nan.h
+++ b/include/hardware_legacy/wifi_nan.h
@@@ -232,14 -232,26 +232,27 @@@ typedef enum 
      NAN_DP_FORCE_CHANNEL_SETUP
  } NanDataPathChannelCfg;
  
- /* NAN Ranging Auto response configuration */
+ /* Enable/Disable NAN Ranging Auto response */
  typedef enum {
-     NAN_RANGING_AUTO_RESPONSE_ENABLE = 0,
+     NAN_RANGING_AUTO_RESPONSE_ENABLE = 1,
      NAN_RANGING_AUTO_RESPONSE_DISABLE
- } NanRangingAutoResponseCfg;
+ } NanRangingAutoResponse;
+ 
+ /* Enable/Disable NAN service range report */
+ typedef enum {
+     NAN_DISABLE_RANGE_REPORT = 1,
+     NAN_ENABLE_RANGE_REPORT
+ } NanRangeReport;
+ 
+ /* NAN Range Response */
+ typedef enum {
+     NAN_RANGE_REQUEST_ACCEPT = 1,
+     NAN_RANGE_REQUEST_REJECT,
+     NAN_RANGE_REQUEST_CANCEL
+ } NanRangeResponse;
  
  /* NAN Shared Key Security Cipher Suites Mask */
 +#define NAN_CIPHER_SUITE_SHARED_KEY_NONE 0x00
  #define NAN_CIPHER_SUITE_SHARED_KEY_128_MASK  0x01
  #define NAN_CIPHER_SUITE_SHARED_KEY_256_MASK  0x02