diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2020-09-04 15:10:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 15:10:36 +0000 |
| commit | b1fb1ef3063e204e9bb569810b19ad47056f7950 (patch) | |
| tree | 077121c53abce35931b29f901303b6a5ef53f0e9 /wifi/1.5/default/wifi_legacy_hal.cpp | |
| parent | 27ac2a9d4df152c02cf1c11710faf029822212e7 (diff) | |
| parent | 5cbf6276f5ccd0c8a7d3b6f979a3b2f557c5c229 (diff) | |
Merge changes from topic "60ghz-3-google-hal-60ghz"
* changes:
Wifi: support 60GHz (Wigig) band
Wifi: add new chip capability WIGIG
Diffstat (limited to 'wifi/1.5/default/wifi_legacy_hal.cpp')
| -rw-r--r-- | wifi/1.5/default/wifi_legacy_hal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/1.5/default/wifi_legacy_hal.cpp b/wifi/1.5/default/wifi_legacy_hal.cpp index 7d14e9d231..398bfac3f6 100644 --- a/wifi/1.5/default/wifi_legacy_hal.cpp +++ b/wifi/1.5/default/wifi_legacy_hal.cpp @@ -486,7 +486,7 @@ WifiLegacyHal::requestFirmwareMemoryDump(const std::string& iface_name) { return {status, std::move(firmware_dump)}; } -std::pair<wifi_error, uint32_t> WifiLegacyHal::getSupportedFeatureSet( +std::pair<wifi_error, uint64_t> WifiLegacyHal::getSupportedFeatureSet( const std::string& iface_name) { feature_set set = 0, chip_set = 0; wifi_error status = WIFI_SUCCESS; @@ -502,7 +502,7 @@ std::pair<wifi_error, uint32_t> WifiLegacyHal::getSupportedFeatureSet( status = global_func_table_.wifi_get_supported_feature_set(iface_handle, &set); } - return {status, static_cast<uint32_t>(set | chip_set)}; + return {status, static_cast<uint64_t>(set | chip_set)}; } std::pair<wifi_error, PacketFilterCapabilities> |