Revert "[nrfconnect] Pulled patches for the nRF Wi-Fi platform (project-chip#33196)"

This reverts commit 4ee8d4e.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

config/nrfconnect/chip-module/Kconfig.defaults

@@ -203,27 +203,15 @@ config CHIP_QSPI_NOR
     default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
 
 # nRF7002DK uses SPI NOR external flash
-
-if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
-
 config CHIP_SPI_NOR
-    default y
-
-endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+    default y if BOARD_NRF7002DK_NRF5340_CPUAPP
 
 config BOOT_IMAGE_ACCESS_HOOKS
     default y if SOC_SERIES_NRF53X
 
 config UPDATEABLE_IMAGE_NUMBER
-    default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE
     default 2 if SOC_SERIES_NRF53X
 
-config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT
-    default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE
-
-config NRF_WIFI_FW_PATCH_DFU
-    default y if NRF_WIFI_PATCHES_EXT_FLASH_STORE
-
 # ==============================================================================
 # OpenThread configuration
 # ==============================================================================

config/nrfconnect/chip-module/Kconfig.features

@@ -21,7 +21,7 @@ if CHIP
 
 config CHIP_WIFI
 	bool "Enable nrfconnect Wi-Fi support"
-	default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+	default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB
 	select WIFI_NRF700X
 	select WIFI
 	select WPA_SUPP
@@ -149,7 +149,7 @@ endif
 config CHIP_DFU_OVER_BT_SMP
 	bool "Enable DFU over Bluetooth LE SMP feature set"
 	imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
-	imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+	imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP
 	imply BOOTLOADER_MCUBOOT
 	select MCUMGR
 	select MCUMGR_TRANSPORT_BT

config/nrfconnect/chip-module/Kconfig.mcuboot.defaults

@@ -39,7 +39,7 @@ choice LIBC_IMPLEMENTATION
 endchoice
 
 # nRF7002DK uses SPI NOR external flash
-if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+if BOARD_NRF7002DK_NRF5340_CPUAPP
 
 config SPI
     default y

src/platform/nrfconnect/wifi/WiFiManager.cpp

@@ -189,22 +189,7 @@ CHIP_ERROR WiFiManager::Scan(const ByteSpan & ssid, ScanResultCallback resultCal
     mWiFiState          = WIFI_STATE_SCANNING;
     mSsidFound          = false;
 
-    wifi_scan_params * scanParams{ nullptr };
-    size_t scanParamsSize{ 0 };
-
-    if (!ssid.empty())
-    {
-        /* We must assume that the ssid is handled as a NULL-terminated string.
-           Note that the mScanSsidBuffer is initialized with zeros. */
-        VerifyOrReturnError(ssid.size() < sizeof(mScanSsidBuffer), CHIP_ERROR_INVALID_ARGUMENT);
-        memcpy(mScanSsidBuffer, ssid.data(), ssid.size());
-        mScanSsidBuffer[ssid.size()] = 0; // indicate the end of ssid string
-        mScanParams.ssids[0]         = mScanSsidBuffer;
-        mScanParams.ssids[1]         = nullptr; // indicate the end of ssids list
-        scanParams                   = &mScanParams;
-        scanParamsSize               = sizeof(*scanParams);
-    }
-    if (0 != net_mgmt(NET_REQUEST_WIFI_SCAN, mNetIf, scanParams, scanParamsSize))
+    if (0 != net_mgmt(NET_REQUEST_WIFI_SCAN, mNetIf, NULL, 0))
     {
         ChipLogError(DeviceLayer, "Scan request failed");
         return CHIP_ERROR_INTERNAL;

src/platform/nrfconnect/wifi/WiFiManager.h

@@ -222,9 +222,7 @@ class WiFiManager
 
     net_if * mNetIf{ nullptr };
     ConnectionParams mWiFiParams{};
-    ConnectionHandling mHandling{};
-    wifi_scan_params mScanParams{};
-    char mScanSsidBuffer[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1] = { 0 };
+    ConnectionHandling mHandling;
     wifi_iface_state mWiFiState;
     wifi_iface_state mCachedWiFiState;
     net_mgmt_event_callback mWiFiMgmtClbk{};