diff options
| author | Zongheng Wang <wangzongheng@google.com> | 2019-11-15 20:40:33 +0000 |
|---|---|---|
| committer | Zongheng Wang <wangzongheng@google.com> | 2019-11-15 20:40:33 +0000 |
| commit | ad2b44760de163e4d2104c74ec64e37f37723ff3 (patch) | |
| tree | 2dc4c15ce23ceb6a681b2727d19dc34bda8b2853 /wifi/1.4/default/hidl_struct_util.cpp | |
| parent | 046257fd2e916ced9a16596d66e003402b90dce2 (diff) | |
Revert "Wifi: Support check on device capability for 6GHZ"
This reverts commit 046257fd2e916ced9a16596d66e003402b90dce2.
Reason for revert: b/144576287 broke git_master
Change-Id: I357df4a242a3ae22c793f8f4120199f04cbcdfa2
Diffstat (limited to 'wifi/1.4/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.4/default/hidl_struct_util.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/wifi/1.4/default/hidl_struct_util.cpp b/wifi/1.4/default/hidl_struct_util.cpp index 13a09f3438..61f311ec24 100644 --- a/wifi/1.4/default/hidl_struct_util.cpp +++ b/wifi/1.4/default/hidl_struct_util.cpp @@ -91,7 +91,7 @@ V1_3::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability( } IWifiStaIface::StaIfaceCapabilityMask -convertLegacyFeatureToHidlStaIfaceCapability(uint64_t feature) { +convertLegacyFeatureToHidlStaIfaceCapability(uint32_t feature) { using HidlStaIfaceCaps = IWifiStaIface::StaIfaceCapabilityMask; switch (feature) { case WIFI_FEATURE_GSCAN: @@ -120,8 +120,6 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint64_t feature) { return HidlStaIfaceCaps::ND_OFFLOAD; case WIFI_FEATURE_MKEEP_ALIVE: return HidlStaIfaceCaps::KEEP_ALIVE; - case WIFI_FEATURE_INFRA_6G: - return HidlStaIfaceCaps::STA_6G; }; CHECK(false) << "Unknown legacy feature: " << feature; return {}; @@ -367,7 +365,7 @@ bool convertLegacyWifiMacInfosToHidl( } bool convertLegacyFeaturesToHidlStaCapabilities( - uint64_t legacy_feature_set, uint32_t legacy_logger_feature_set, + uint32_t legacy_feature_set, uint32_t legacy_logger_feature_set, uint32_t* hidl_caps) { if (!hidl_caps) { return false; @@ -386,8 +384,7 @@ bool convertLegacyFeaturesToHidlStaCapabilities( WIFI_FEATURE_IE_WHITELIST, WIFI_FEATURE_SCAN_RAND, WIFI_FEATURE_INFRA_5G, WIFI_FEATURE_HOTSPOT, WIFI_FEATURE_PNO, WIFI_FEATURE_TDLS, WIFI_FEATURE_TDLS_OFFCHANNEL, - WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE, - WIFI_FEATURE_INFRA_6G}) { + WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE}) { if (feature & legacy_feature_set) { *hidl_caps |= convertLegacyFeatureToHidlStaIfaceCapability(feature); } |