Merge "Add a maximum MLO association link count"
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 f640861..b5034ea 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,7 @@
package android.hardware.wifi;
@VintfStability
parcelable WifiChipCapabilities {
+ int maxMloAssociationLinkCount;
int maxMloStrLinkCount;
int maxConcurrentTdlsSessionCount;
}
diff --git a/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl b/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl
index 4e0578b..77b9049 100644
--- a/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl
+++ b/wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl
@@ -22,6 +22,10 @@
@VintfStability
parcelable WifiChipCapabilities {
/**
+ * Maximum number of links supported by the chip for MLO association.
+ */
+ int maxMloAssociationLinkCount;
+ /**
* 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.
diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp
index 2d745dc..4094c36 100644
--- a/wifi/aidl/default/aidl_struct_util.cpp
+++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -3290,6 +3290,8 @@
const legacy_hal::wifi_chip_capabilities& legacy_chip_capabilities,
WifiChipCapabilities& aidl_chip_capabilities) {
aidl_chip_capabilities.maxMloStrLinkCount = legacy_chip_capabilities.max_mlo_str_link_count;
+ aidl_chip_capabilities.maxMloAssociationLinkCount =
+ legacy_chip_capabilities.max_mlo_association_link_count;
aidl_chip_capabilities.maxConcurrentTdlsSessionCount =
legacy_chip_capabilities.max_concurrent_tdls_session_count;
return true;