From 74e381efa4706a40859b544e62fc2a61bd7ab04d Mon Sep 17 00:00:00 2001
From: shgutte <shgutte@silabs.com>
Date: Wed, 10 Jan 2024 16:00:05 +0530
Subject: [PATCH] Added changes accroding to comments

---
 .../platform/silabs/efr32/rs911x/rs9117.gni   | 23 -------------------
 src/platform/silabs/rs911x/rsi_ble_config.h   |  6 -----
 third_party/silabs/efr32_sdk.gni              |  6 ++++-
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/examples/platform/silabs/efr32/rs911x/rs9117.gni b/examples/platform/silabs/efr32/rs911x/rs9117.gni
index 0878312ac45bec..251de0be213fe6 100644
--- a/examples/platform/silabs/efr32/rs911x/rs9117.gni
+++ b/examples/platform/silabs/efr32/rs911x/rs9117.gni
@@ -15,29 +15,6 @@ rs9117_inc_plat = [
   "${examples_plat_dir}/rs911x",
   "${examples_plat_dir}/rs911x/hal",
   "${wifi_sdk_root}/components/si91x/ble/inc",
-
-   # si91x component
-  "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ble/inc",
-  "${wifi_sdk_root}/components/device/silabs/si91x/wireless/inc",
-  "${wifi_sdk_root}/components/common/inc",
-  "${wifi_sdk_root}/components/si91x/memory",
-  "${wifi_sdk_root}/components/device/silabs/si91x/wireless/sl_net/inc",
-
-  # wifi component
-  "${wifi_sdk_root}/components/protocol/wifi/inc",
-
-  # si91x_support component
-  "${wifi_sdk_root}/components/si91x_support/inc",
-
-  # wifi_resources component
-  "${wifi_sdk_root}/resources/certificates",
-  "${wifi_sdk_root}/resources/defaults",
-  "${wifi_sdk_root}/resources/other",
-
-  # network_manager component
-  "${wifi_sdk_root}/components/service/network_manager/inc",
-
-  "${wifi_sdk_root}/components/protocol/wifi/si91x",
 ]
 
 rs911x_cflags = [ "-Wno-empty-body" ]
diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h
index cbe36e86ffe367..3ece78dcb7bb81 100644
--- a/src/platform/silabs/rs911x/rsi_ble_config.h
+++ b/src/platform/silabs/rs911x/rsi_ble_config.h
@@ -36,12 +36,6 @@
 #define RSI_FAILURE -1
 #endif
 
-#define WIFI_ENABLE_SECURITY_WPA3_TRANSITION 0
-
-#ifndef CHIP_DEVICE_CONFIG_ENABLE_IPV4
-#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 0
-#endif
-
 #define RSI_BLE_CONN_EVENT (0x01)
 #define RSI_BLE_DISCONN_EVENT (0x02)
 #define RSI_BLE_GATT_WRITE_EVENT (0x03)
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 0e2892c18aa71f..c4a6cbf2904f73 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -213,13 +213,15 @@ template("efr32_sdk") {
 
     if (use_SiWx917) {
       _include_dirs += [
+         # si91x component
         "${wifi_sdk_root}/components/si91x/memory",
-        "${wifi_sdk_root}/components/device/silabs/si91x/wireless/inc",
         "${wifi_sdk_root}/components/device/silabs/si91x/wireless/sl_net/inc",
         "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/rom_driver/inc",
         "${wifi_sdk_root}/components/device/silabs/si91x/mcu/core/chip/inc",
         "${wifi_sdk_root}/components/common/inc",
         "${wifi_sdk_root}/components/device/silabs/si91x/mcu/core/config",
+        "${wifi_sdk_root}/components/device/silabs/si91x/wireless/inc",
+        "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ble/inc",
 
         # wifi component
         "${wifi_sdk_root}/components/protocol/wifi/inc",
@@ -234,6 +236,8 @@ template("efr32_sdk") {
 
         # network_manager component
         "${wifi_sdk_root}/components/service/network_manager/inc",
+
+        "${wifi_sdk_root}/components/protocol/wifi/si91x",
       ]
     }
     if (use_rs9116 || use_SiWx917) {