summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-01-18 15:33:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-01-18 15:33:47 +0000
commitab16b319f4484cc8e1b6078bde919b4a72e6cd00 (patch)
tree97fc0f1db421aaeedac22acc71d760dc2eedd7f6
parent342658139ff9161b948a1f95f464ed9e8dcb8be4 (diff)
parent656f82054a24627dd3a25ad1a1b1c870c8e03272 (diff)
Merge "wifi: Add capabilitiy flag for ND offload"
-rw-r--r--wifi/1.0/IWifiStaIface.hal8
-rw-r--r--wifi/1.0/default/hidl_struct_util.cpp3
2 files changed, 9 insertions, 2 deletions
diff --git a/wifi/1.0/IWifiStaIface.hal b/wifi/1.0/IWifiStaIface.hal
index 0d6b5604fc..7dad8aff5a 100644
--- a/wifi/1.0/IWifiStaIface.hal
+++ b/wifi/1.0/IWifiStaIface.hal
@@ -81,13 +81,17 @@ interface IWifiStaIface extends IWifiIface {
*/
TDLS_OFFCHANNEL = 1 << 11,
/**
+ * Support for neighbour discovery offload.
+ */
+ ND_OFFLOAD = 1 << 12,
+ /**
* Support for keep alive packet offload.
*/
- KEEP_ALIVE = 1 << 12,
+ KEEP_ALIVE = 1 << 13,
/**
* Support for tracking connection packets' fate.
*/
- DEBUG_PACKET_FATE = 1 << 13
+ DEBUG_PACKET_FATE = 1 << 14
};
/**
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp
index 80cc56e3a9..bbb9346179 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -82,6 +82,8 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint32_t feature) {
return HidlStaIfaceCaps::TDLS;
case WIFI_FEATURE_TDLS_OFFCHANNEL:
return HidlStaIfaceCaps::TDLS_OFFCHANNEL;
+ case WIFI_FEATURE_CONFIG_NDO:
+ return HidlStaIfaceCaps::ND_OFFLOAD;
case WIFI_FEATURE_MKEEP_ALIVE:
return HidlStaIfaceCaps::KEEP_ALIVE;
};
@@ -242,6 +244,7 @@ bool convertLegacyFeaturesToHidlStaCapabilities(
WIFI_FEATURE_PNO,
WIFI_FEATURE_TDLS,
WIFI_FEATURE_TDLS_OFFCHANNEL,
+ WIFI_FEATURE_CONFIG_NDO,
WIFI_FEATURE_MKEEP_ALIVE}) {
if (feature & legacy_feature_set) {
*hidl_caps |= convertLegacyFeatureToHidlStaIfaceCapability(feature);