[Silabs] Adds refactored chip_enable_wifi_ipv4 flag (#25723)

* Refactors chip_enable_wifi_ipv4 flag * Porting changes to SiWx917 * Incorporating comments
project-chip · Mar 22, 2023 · 82af6b5 · 82af6b5
1 parent f0bd871
commit 82af6b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -170,7 +170,7 @@ else
                 shift
                 ;;
             --chip_enable_wifi_ipv4)
-                optArgs+="chip_enable_wifi_ipv4=true "
+                ipArgs="chip_enable_wifi_ipv4=true chip_inet_config_enable_ipv4=true "
                 shift
                 ;;
             --additional_data_advertising)
@@ -234,6 +234,7 @@ else
     BUILD_DIR=$OUTDIR/$SILABS_BOARD
     echo BUILD_DIR="$BUILD_DIR"
     if [ "$USE_WIFI" == true ]; then
+        optArgs+="$ipArgs"
         gn gen --check --fail-on-unused-args --export-compile-commands --root="$ROOT" --dotfile="$ROOT"/build_for_wifi_gnfile.gn --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
     else
         # OpenThread build

diff --git a/src/platform/silabs/SiWx917/wifi_args.gni b/src/platform/silabs/SiWx917/wifi_args.gni
@@ -43,7 +43,8 @@ lwip_ethernet = true
 
 chip_device_platform = "SiWx917"
 chip_enable_openthread = false
-chip_inet_config_enable_ipv4 = true
+
+chip_inet_config_enable_ipv4 = false
 chip_inet_config_enable_dns_resolver = false
 chip_inet_config_enable_tcp_endpoint = true
 

diff --git a/src/platform/silabs/efr32/wifi_args.gni b/src/platform/silabs/efr32/wifi_args.gni
@@ -46,7 +46,8 @@ lwip_ethernet = true
 
 chip_device_platform = "efr32"
 chip_enable_openthread = false
-chip_inet_config_enable_ipv4 = true
+
+chip_inet_config_enable_ipv4 = false
 chip_inet_config_enable_dns_resolver = false
 chip_inet_config_enable_tcp_endpoint = true
 

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -43,7 +43,8 @@ declare_args() {
 
   silabs_log_enabled = true
 
-  # Argument to Disable IPv4 for wifi(rs911)
+  # Argument to enable IPv4 for wifi
+  # aligning to match chip_inet_config_enable_ipv4 default configuration
   chip_enable_wifi_ipv4 = false
 }
 

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -47,7 +47,8 @@ declare_args() {
   # Enable Sleepy end device
   enable_sleepy_device = false
 
-  # Argument to Disable IPv4 for wifi(rs911)
+  # Argument to enable IPv4 for wifi
+  # aligning to match chip_inet_config_enable_ipv4 default configuration
   chip_enable_wifi_ipv4 = false
 }
 
@@ -247,7 +248,7 @@ template("efr32_sdk") {
         import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")
 
         defines += [ "LWIP_NETIF_API=1" ]
-        if (lwip_ipv4) {
+        if (chip_enable_wifi_ipv4) {
           defines += [
             "LWIP_IPV4=1",