Skip to content

Commit 90648b1

Browse files
rosahay-silabsjmartinez-silabs
authored andcommitted
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 <Rohan.Sahay@silabs.com> Date: Thu Sep 8 18:54:58 2022 +0530 Revert "Pull request #69: Adds support for IPv4 by default" This reverts commit 56d941d1adb73dc7a04046c70e6a9a13431ddd1e.
1 parent dbe2aff commit 90648b1

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

examples/light-switch-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ declare_args() {
6262
disable_lcd = false
6363

6464
# Argument to Disable IPv4 for wifi(rs911)
65-
chip_enable_wifi_ipv4 = true
65+
chip_enable_wifi_ipv4 = false
6666

6767
# Argument to force enable WPA3 security
6868
rs91x_wpa3_only = false

examples/lighting-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ declare_args() {
6262
disable_lcd = false
6363

6464
# Argument to Disable IPv4 for wifi(rs911)
65-
chip_enable_wifi_ipv4 = true
65+
chip_enable_wifi_ipv4 = false
6666

6767
# Argument to force enable WPA3 security on rs91x
6868
rs91x_wpa3_only = false

examples/lock-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ declare_args() {
6262
disable_lcd = false
6363

6464
# Argument to Disable IPv4 for wifi(rs911)
65-
chip_enable_wifi_ipv4 = true
65+
chip_enable_wifi_ipv4 = false
6666

6767
# Argument to force enable WPA3 security
6868
rs91x_wpa3_only = false

examples/thermostat/efr32/BUILD.gn

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ declare_args() {
6262
disable_lcd = false
6363

6464
# Argument to Disable IPv4 for wifi(rs911)
65-
chip_enable_wifi_ipv4 = true
65+
chip_enable_wifi_ipv4 = false
6666
}
6767

6868
declare_args() {
@@ -214,6 +214,10 @@ efr32_executable("thermostat_app") {
214214
sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
215215
}
216216

217+
if (chip_enable_wifi_ipv4) {
218+
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
219+
}
220+
217221
# WiFi Settings
218222
if (chip_enable_wifi) {
219223
if (use_rs911x) {
@@ -241,10 +245,6 @@ efr32_executable("thermostat_app") {
241245
sources += wf200_plat_src
242246
include_dirs += wf200_plat_incs
243247
}
244-
245-
if (chip_enable_wifi_ipv4) {
246-
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
247-
}
248248
}
249249

250250
if (!disable_lcd) {

examples/window-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ declare_args() {
5555
disable_lcd = false
5656

5757
# Argument to Disable IPv4 for wifi(rs911)
58-
chip_enable_wifi_ipv4 = true
58+
chip_enable_wifi_ipv4 = false
5959

6060
# Argument to force enable WPA3 security
6161
rs91x_wpa3_only = false

scripts/examples/gn_efr32_example.sh

+4
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ else
144144
optArgs+="enable_sleepy_device=true chip_openthread_ftd=false "
145145
shift
146146
;;
147+
--chip_enable_wifi_ipv4)
148+
optArgs+="chip_enable_wifi_ipv4=true "
149+
shift
150+
;;
147151
--additional_data_advertising)
148152
optArgs+="chip_enable_additional_data_advertising=true chip_enable_rotating_device_id=true "
149153
shift

0 commit comments

Comments
 (0)