From 87ff758b0a94c7758bac916f409903a55dc289ae Mon Sep 17 00:00:00 2001
From: Chirag Bansal <Chirag.Bansal@silabs.com>
Date: Tue, 19 Jul 2022 06:09:33 +0000
Subject: [PATCH] Pull request #20: Disabling the DGWIFI and updating the
 wiseconnect to 2.6.0

Merge in WMN_TOOLS/matter from bugfix/rs911x_2.6.0 to RC_july_25_2022

Squashed commit of the following:

commit c3d3589113455d551ef2038ee7f70c9855cddc15
Author: Chirag Bansal <chirag.bansal@silabs.com>
Date:   Tue Jul 19 10:46:37 2022 +0530

    removing the DGWIFI and updating the wiseconnect to 2.6.0
---
 .../EFR32/DiagnosticDataProviderImpl.cpp      | 24 +++++++++----------
 third_party/silabs/matter_support             |  2 +-
 third_party/silabs/wiseconnect-wifi-bt-sdk    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
index 598e2ca1255662..e7d76ffa219d12 100644
--- a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
@@ -400,13 +400,13 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconLostCount(uint32_t & beaconLostCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         beaconLostCount = extra_info.beacon_lost_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
@@ -417,61 +417,61 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiCurrentMaxRate(uint64_t & currentM
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t & packetMulticastRxCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         packetMulticastRxCount = extra_info.mcast_rx_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         packetMulticastTxCount = extra_info.mcast_tx_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastRxCount(uint32_t & packetUnicastRxCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         packetUnicastRxCount = extra_info.ucast_rx_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         packetUnicastTxCount = extra_info.ucast_tx_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCount)
 {
-    wfx_wifi_scan_ext_t extra_info;
+    /*wfx_wifi_scan_ext_t extra_info;
     int32_t err = wfx_get_ap_ext(&extra_info);
     if (err == 0)
     {
         overrunCount = extra_info.overrun_count;
         return CHIP_NO_ERROR;
-    }
+    }*/
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index 4a46b449dd207d..a580e0b45dfaa9 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 4a46b449dd207d5f72dc4da8e02ff7a2a4ca2a6e
+Subproject commit a580e0b45dfaa902f29285c5693830564609ff5d
diff --git a/third_party/silabs/wiseconnect-wifi-bt-sdk b/third_party/silabs/wiseconnect-wifi-bt-sdk
index d0b93569fab142..4f518b00713a5c 160000
--- a/third_party/silabs/wiseconnect-wifi-bt-sdk
+++ b/third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -1 +1 @@
-Subproject commit d0b93569fab1420e1d26d418f30564c198571abc
+Subproject commit 4f518b00713a5cf4611cde35e038881ee34fe440