From 21a98b4a516a673be2e79579e1c1dc9dc35cc85e Mon Sep 17 00:00:00 2001 From: Mahesh KKV Date: Sun, 5 Feb 2023 20:21:17 -0800 Subject: [PATCH] Rename maxMloLinkCount to maxMloStrLinkCount The maximum number of Simultaneous Transmit Receive (STR) links used in Multi-Link Operation can be different from the maximum radios supported by the chip.Explicitly mention the max links as max STR links. Update the description and usage of the capability field. Bug: 267963579 Test: m android.hardware.wifi-update-api Change-Id: I5691fcc44c60821766fe41e67624e458ba051059 --- .../android/hardware/wifi/WifiChipCapabilities.aidl | 2 +- wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl | 8 ++++---- wifi/aidl/default/aidl_struct_util.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChipCapabilities.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChipCapabilities.aidl index 48dc8e0805..f640861101 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChipCapabilities.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChipCapabilities.aidl @@ -34,6 +34,6 @@ package android.hardware.wifi; @VintfStability parcelable WifiChipCapabilities { - int maxMloLinkCount; + int maxMloStrLinkCount; int maxConcurrentTdlsSessionCount; } diff --git a/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl b/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl index f65d49ac28..4e0578b61c 100644 --- a/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl +++ b/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl @@ -22,13 +22,13 @@ package android.hardware.wifi; @VintfStability parcelable WifiChipCapabilities { /** - * Maximum number of links used in Multi-Link Operation. The maximum - * number of links used for MLO can be different from the number of - * radios supported by the chip. + * Maximum number of Simultaneous Transmit and Receive (STR) links used + * in Multi-Link Operation. The maximum number of STR links used can be + * different from the maximum number of radios supported by the chip. * * This is a static configuration of the chip. */ - int maxMloLinkCount; + int maxMloStrLinkCount; /** * Maximum number of concurrent TDLS sessions that can be enabled * by framework via ISupplicantStaIface#initiateTdlsSetup(). diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index 68fe2e6edc..921b5dc38c 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -3316,7 +3316,7 @@ bool convertLegacyNanBootstrappingConfirmIndToAidl( bool convertLegacyWifiChipCapabilitiesToAidl( const legacy_hal::wifi_chip_capabilities& legacy_chip_capabilities, WifiChipCapabilities& aidl_chip_capabilities) { - aidl_chip_capabilities.maxMloLinkCount = legacy_chip_capabilities.max_mlo_link_count; + aidl_chip_capabilities.maxMloStrLinkCount = legacy_chip_capabilities.max_mlo_str_link_count; aidl_chip_capabilities.maxConcurrentTdlsSessionCount = legacy_chip_capabilities.max_concurrent_tdls_session_count; return true;