From e338c81190db1ed025bc9c5e209ed577a951d531 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 10 Jan 2019 13:57:06 -0800 Subject: [PATCH] [AWARE] Disable NANv3 data-path capabilities Disable the firmware to send NANv3 data-path negotiations packets. Means that device will only use NANv2 data-path negotiation packets. That is interoperable - though may miss extra information from pure NANv3 peers - where extra = port/transport-protocol/ipv6 address (we have an AOSP-specific emulation of this feature). Bug: 112586769 Test: (ACTS) act.py ThroughputTest:test_iperf_max_ndi_aware_only_passphrases Test: (CTS) atest SingleDeviceTest Change-Id: I3fd3e3bfc80a7815e035c592967e5448601c8153 --- wifi/1.3/default/hidl_struct_util.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wifi/1.3/default/hidl_struct_util.cpp b/wifi/1.3/default/hidl_struct_util.cpp index a24d0487a0..a102deff04 100644 --- a/wifi/1.3/default/hidl_struct_util.cpp +++ b/wifi/1.3/default/hidl_struct_util.cpp @@ -1253,6 +1253,10 @@ bool convertHidlNanEnableRequestToLegacy( hidl_request.debugConfigs .useSdfInBandVal[(size_t)NanBandIndex::NAN_BAND_5GHZ]; + // disable NANv3 NDPe + legacy_request->config_ndpe_attr = 1; + legacy_request->use_ndpe_attr = 0; + return true; } @@ -1764,6 +1768,10 @@ bool convertHidlNanConfigRequestToLegacy( hidl_request.bandSpecificConfig[(size_t)NanBandIndex::NAN_BAND_5GHZ] .discoveryWindowIntervalVal; + // disable NANv3 NDPe + legacy_request->config_ndpe_attr = 1; + legacy_request->use_ndpe_attr = 0; + return true; }