From 326026edf4ce5fb939478b45162c68c434d034e8 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 23 Jan 2025 12:34:27 +0100 Subject: [PATCH] [toup][nrfconnect] Fix compatibility with wifi driver Replace static assert with runtime check due to wifi_scan_result.ssid size change. Signed-off-by: Adrian Gielniewski --- src/platform/nrfconnect/wifi/WiFiManager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/platform/nrfconnect/wifi/WiFiManager.cpp b/src/platform/nrfconnect/wifi/WiFiManager.cpp index 37b075be14..f8901281f6 100644 --- a/src/platform/nrfconnect/wifi/WiFiManager.cpp +++ b/src/platform/nrfconnect/wifi/WiFiManager.cpp @@ -68,9 +68,8 @@ NetworkCommissioning::WiFiScanResponse ToScanResponse(const wifi_scan_result * r { NetworkCommissioning::WiFiScanResponse response = {}; - if (result != nullptr) + if (result != nullptr && sizeof(response.ssid) >= result->ssid_length) { - static_assert(sizeof(response.ssid) == sizeof(result->ssid), "SSID length mismatch"); static_assert(sizeof(response.bssid) == sizeof(result->mac), "BSSID length mismatch"); // TODO: Distinguish WPA versions