From 2eef52d3317c8e08f8c84cb39ba64a5e26cc9938 Mon Sep 17 00:00:00 2001 From: Chirag Bansal Date: Wed, 20 Jul 2022 04:52:00 +0000 Subject: [PATCH] Pull request #21: Bugfix/ap not found Merge in WMN_TOOLS/matter from bugfix/ap_not_found to RC_july_25_2022 Squashed commit of the following: commit 98faf3d374417e5985829c045513004bddbfe5ec Author: Chirag Bansal Date: Tue Jul 19 23:54:09 2022 +0530 Added support for RS9116 2.6.0 FW and commented DGWIFI commit 256f104fee65c4fe4662f9011f41c8f4d5b912f1 Merge: c604386fa 8c5d11ffb Author: Chirag Bansal Date: Tue Jul 19 23:49:53 2022 +0530 Merge branch 'bugfix/ap_not_found' of ssh://stash.silabs.com/wmn_tools/matter into bugfix/ap_not_found commit 8c5d11ffb9cf96ba5ec7513d73d52e7ee6c8764d Author: Chirag Bansal Date: Tue Jul 19 17:00:55 2022 +0530 Added fixes for AP not found commit 9e9130275e8591dc2ec8abb8ee30ec1f8f7af5c0 Author: Chirag Bansal Date: Tue Jul 19 16:58:26 2022 +0530 Revert "Added fixes for AP not found" This reverts commit 6456c15136c84f85c01d71ca2d51b59144646fc8. commit 5d1f4ede58392523c32bdfe16f1335ed42c5500b Author: Chirag Bansal Date: Tue Jul 19 16:57:30 2022 +0530 Added fixes for AP not found commit c604386fa48e8d0c823b17bd2980391399cb20b8 Author: Chirag Bansal Date: Tue Jul 19 17:00:55 2022 +0530 Added fixes for AP not found commit 8a21f302bebfa6f6fd3ef5eeb357c2aeb00be9d0 Author: Chirag Bansal Date: Tue Jul 19 16:58:26 2022 +0530 Revert "Added fixes for AP not found" This reverts commit 6456c15136c84f85c01d71ca2d51b59144646fc8. commit 6456c15136c84f85c01d71ca2d51b59144646fc8 Author: Chirag Bansal Date: Tue Jul 19 16:57:30 2022 +0530 Added fixes for AP not found --- src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp | 2 +- third_party/silabs/matter_support | 2 +- third_party/silabs/wiseconnect-wifi-bt-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp b/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp index 7bc9883799e28e..54e38020c7949d 100644 --- a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp @@ -130,7 +130,7 @@ CHIP_ERROR SlWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, wfx_wifi_provision_t wifiConfig = {}; memcpy(wifiConfig.ssid, ssid, ssidLen); memcpy(wifiConfig.passkey, key, keyLen); - wifiConfig.security = WFX_SEC_WPA2; + wifiConfig.security = WFX_SEC_WPA_WPA2_MIXED; ChipLogProgress(NetworkProvisioning, "Setting up connection for WiFi SSID: %.*s", static_cast(ssidLen), ssid); // Configure the WFX WiFi interface. diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index a580e0b45dfaa9..285d8da79adfe1 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit a580e0b45dfaa902f29285c5693830564609ff5d +Subproject commit 285d8da79adfe16aa5b26098b6e198457cfe77de diff --git a/third_party/silabs/wiseconnect-wifi-bt-sdk b/third_party/silabs/wiseconnect-wifi-bt-sdk index 4f518b00713a5c..34cfc3b5defde8 160000 --- a/third_party/silabs/wiseconnect-wifi-bt-sdk +++ b/third_party/silabs/wiseconnect-wifi-bt-sdk @@ -1 +1 @@ -Subproject commit 4f518b00713a5cf4611cde35e038881ee34fe440 +Subproject commit 34cfc3b5defde86e6110bfdce4cb9804d0657105