Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebc0e830 authored by Yi Shiou (Les) Lee's avatar Yi Shiou (Les) Lee Committed by Android (Google) Code Review
Browse files

Merge "Wifi: Allow reporting MULTIPLE_MLD_ON_SAP feature flag to userspace." into main

parents f33aa725 279b3d51

wifi/aidl/default/aidl_struct_util.cpp

+4 −1
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ IWifiChip::FeatureSetMask convertLegacyChipFeatureToAidl(uint64_t feature) { 
            return IWifiChip::FeatureSetMask::SET_VOIP_MODE;

        case WIFI_FEATURE_MLO_SAP:

            return IWifiChip::FeatureSetMask::MLO_SAP;

        case WIFI_FEATURE_MULTIPLE_MLD_ON_SAP:

            return IWifiChip::FeatureSetMask::MULTIPLE_MLD_ON_SAP;

    };

    CHECK(false) << "Unknown legacy feature: " << feature;

    return {};
@@ -122,7 +124,8 @@ bool convertLegacyChipFeaturesToAidl(uint64_t legacy_feature_set, uint32_t* aidl 
                                      WIFI_FEATURE_P2P_RAND_MAC,

                                      WIFI_FEATURE_AFC_CHANNEL,

                                      WIFI_FEATURE_SET_VOIP_MODE,

                                      WIFI_FEATURE_MLO_SAP};

                                      WIFI_FEATURE_MLO_SAP,

                                      WIFI_FEATURE_MULTIPLE_MLD_ON_SAP};

    for (const auto feature : features) {

        if (feature & legacy_feature_set) {

            *aidl_feature_set |= static_cast<uint32_t>(convertLegacyChipFeatureToAidl(feature));

wifi/legacy_headers/include/hardware_legacy/wifi_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ void wifi_get_error_info(wifi_error err, const char **msg); // return a pointer 
#define WIFI_FEATURE_SET_VOIP_MODE          (uint64_t)0x1000000000 // Support Voip mode setting

#define WIFI_FEATURE_CACHED_SCAN_RESULTS    (uint64_t)0x2000000000 // Support cached scan result report

#define WIFI_FEATURE_MLO_SAP (uint64_t)0x4000000000                // Support MLO SoftAp

#define WIFI_FEATURE_MULTIPLE_MLD_ON_SAP \

    (uint64_t)0x8000000000  // Support Multiple MLD SoftAp (Bridged Dual 11be SoftAp)

// Add more features here



#define IS_MASK_SET(mask, flags)        (((flags) & (mask)) == (mask))