Pull request #81: Revert "Pull request #69: Adds support for IPv4 by …

…default" Merge in WMN_TOOLS/matter from feature/disable-default-ipv4-flag to RC_0.3.0 Squashed commit of the following: commit 4e96708b536cbd62f57c727fdcc973d749af80c6 Author: rosahay-silabs <[email protected]> Date: Thu Sep 8 18:54:58 2022 +0530 Revert "Pull request #69: Adds support for IPv4 by default" This reverts commit 56d941d1adb73dc7a04046c70e6a9a13431ddd1e.
SiliconLabs · Sep 8, 2022 · 90648b1 · 90648b1
1 parent dbe2aff
commit 90648b1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -62,7 +62,7 @@ declare_args() {
   disable_lcd = false
 
   # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = true
+  chip_enable_wifi_ipv4 = false
 
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -62,7 +62,7 @@ declare_args() {
   disable_lcd = false
 
   # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = true
+  chip_enable_wifi_ipv4 = false
 
   # Argument to force enable WPA3 security on rs91x
   rs91x_wpa3_only = false

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -62,7 +62,7 @@ declare_args() {
   disable_lcd = false
 
   # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = true
+  chip_enable_wifi_ipv4 = false
 
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false

diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn
@@ -62,7 +62,7 @@ declare_args() {
   disable_lcd = false
 
   # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = true
+  chip_enable_wifi_ipv4 = false
 }
 
 declare_args() {
@@ -214,6 +214,10 @@ efr32_executable("thermostat_app") {
     sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
   }
 
+  if (chip_enable_wifi_ipv4) {
+    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {
@@ -241,10 +245,6 @@ efr32_executable("thermostat_app") {
       sources += wf200_plat_src
       include_dirs += wf200_plat_incs
     }
-
-    if (chip_enable_wifi_ipv4) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
-    }
   }
 
   if (!disable_lcd) {

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -55,7 +55,7 @@ declare_args() {
   disable_lcd = false
 
   # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = true
+  chip_enable_wifi_ipv4 = false
 
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false

diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -144,6 +144,10 @@ else
                 optArgs+="enable_sleepy_device=true chip_openthread_ftd=false "
                 shift
                 ;;
+            --chip_enable_wifi_ipv4)
+                optArgs+="chip_enable_wifi_ipv4=true "
+                shift
+                ;;
             --additional_data_advertising)
                 optArgs+="chip_enable_additional_data_advertising=true chip_enable_rotating_device_id=true "
                 shift