commit 41fc794eff876dd19a47a945bddd856ea2c849a3
author Etan Cohen <etancohen@google.com> Tue Mar 21 18:01:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 21 18:01:03 2017 +0000
tree ca00a2bb808c6e16d40b50b7d99dc55a844494cf
parent eaed213c023a1f918cd98efd3bb847964277307d
parent 980baf1bd79ff3ff8cdac3dd929f1b31bb174917

Merge "[AWARE]: Fix Nan capabilities mismatch"
am: 980baf1bd7

Change-Id: I01b2d62e40d25be61463ca93ea2153ce086a2be3

include/hardware_legacy/wifi_nan.h

diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h
index c7d482a..d3875d6 100644
--- a/include/hardware_legacy/wifi_nan.h
+++ b/include/hardware_legacy/wifi_nan.h
@@ -320,9 +320,12 @@
     u32 max_ndp_sessions;
     u32 max_app_info_len;
     u32 max_queued_transmit_followup_msgs;
+    u32 ndp_supported_bands;
     u32 cipher_suites_supported;
-    u32 max_subscribe_address;
+    u32 max_scid_len;
+    bool is_ndp_security_supported;
     u32 max_sdea_service_specific_info_len;
+    u32 max_subscribe_address;
 } NanCapabilities;
 
 /*