Reintroduces CHIP_DEVICE_CONFIG_ENABLE_IPV4 instead of LWIP_IPV4 prep…

…rocessor
project-chip · Jun 9, 2022 · 187d603 · 187d603
1 parent 95ef889
commit 187d603
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -93,3 +93,9 @@
 #define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
 
 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25
+
+#ifdef RS911X_WIFI
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_IPV4
+#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 1
+#endif /* !CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
+#endif /* RS911X_WIFI */
diff --git a/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp b/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp
@@ -390,9 +390,9 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
     // If the WiFi station is currently in the connected state...
     if (mWiFiStationState == kWiFiStationState_Connected)
     {
-#if LWIP_IPV4
+#if CHIP_DEVICE_CONFIG_ENABLE_IPV4
         haveIPv4Conn = wfx_have_ipv4_addr(SL_WFX_STA_INTERFACE);
-#endif /* LWIP_IPV4 */
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
         haveIPv6Conn = wfx_have_ipv6_addr(SL_WFX_STA_INTERFACE);
     }
 

diff --git a/third_party/efr32_sdk/repo b/third_party/efr32_sdk/repo
+66 −70		matter/wifi/dhcp_client.cpp
+168 −187		matter/wifi/ethernetif.cpp
+54 −61		matter/wifi/lwip_netif.cpp
+69 −69		matter/wifi/rs911x/rs911x.gni
+68 −47		matter/wifi/rs911x/rsi_if.c
+33 −31		matter/wifi/rs911x/wfx_rsi_host.c
+69 −77		matter/wifi/wfx_notify.cpp