From 10585442f3daaf1caa5c0dc81682c129dd144a94 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 14 Apr 2023 16:18:22 -0400 Subject: [PATCH] Fix boufallolab build. (#26108) Merge conflict between https://github.com/project-chip/connectedhomeip/pull/26099 and https://github.com/project-chip/connectedhomeip/pull/26088 led to things not building. --- .../bouffalolab/BL602/DiagnosticDataProviderImpl.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp index 7cb3b802dd8036..3597e599a4c587 100644 --- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp +++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp @@ -221,10 +221,7 @@ DiagnosticDataProvider & GetDiagnosticDataProviderImpl() CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId) { - BssId = ByteSpan(wifiMgmr.wifi_mgmr_stat_info.bssid, sizeof(wifiMgmr.wifi_mgmr_stat_info.bssid)); - - // TODO: This does not actually put the data in the out param. - return CHIP_ERROR_READ_FAILED; + return CopySpanToMutableSpan(ByteSpan(wifiMgmr.wifi_mgmr_stat_info.bssid), BssId); } CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)