treewide: Migrate to upstream Zephyr WPA supplicant

nRF70 now uses upstream Zephyr WPA supplicant. Signed-off-by: Chaitanya Tata <[email protected]>
nrfconnect · Sep 10, 2024 · 92fb728 · 92fb728
1 parent eaa011c
commit 92fb728
Show file tree

Hide file tree

Showing 51 changed files with 91 additions and 85 deletions.
diff --git a/applications/asset_tracker_v2/boards/thingy91x_nrf9151_ns.conf b/applications/asset_tracker_v2/boards/thingy91x_nrf9151_ns.conf
@@ -50,7 +50,7 @@ CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
 CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

diff --git a/applications/asset_tracker_v2/overlay-nrf7002ek-wifi-scan-only.conf b/applications/asset_tracker_v2/overlay-nrf7002ek-wifi-scan-only.conf
@@ -41,7 +41,7 @@ CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
 CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

diff --git a/doc/_scripts/software_maturity/software_maturity_features.yaml b/doc/_scripts/software_maturity/software_maturity_features.yaml
@@ -109,7 +109,7 @@ features:
       boards_and_shields:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
     SoftAP Mode (for Wi-Fi provisioning):
-      rule: WIFI_NRF70 && NRF700X_AP_MODE && WPA_SUPP_AP
+      rule: WIFI_NRF70 && NRF700X_AP_MODE && WIFI_NM_WPA_SUPPLICANT_AP
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000

diff --git a/doc/nrf/protocols/matter/getting_started/memory_optimization.rst b/doc/nrf/protocols/matter/getting_started/memory_optimization.rst
@@ -393,11 +393,11 @@ The following table presents the possible threads used in a Matter application a
 | net_mgmt            | :kconfig:option:`CONFIG_NET_MGMT_EVENT_STACK_SIZE`               | Zephyr network management event processing thread stack.       |
 |                     |                                                                  | For Matter over Wi-Fi only.                                    |
 +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+
-| wpa_supplicant_main | :kconfig:option:`CONFIG_WPA_SUPP_THREAD_STACK_SIZE`              | WPA supplicant main thread.                                    |
+| wpa_supplicant_main | :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE`| WPA supplicant main thread.                                    |
 |                     |                                                                  | Processing Wi-Fi requests and connections.                     |
 |                     |                                                                  | For Matter over Wi-Fi only.                                    |
 +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+
-| wpa_supplicant_wq   | :kconfig:option:`CONFIG_WPA_SUPP_WQ_STACK_SIZE`                  | WPA supplicant work queue thread.                              |
+| wpa_supplicant_wq   | :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE`    | WPA supplicant work queue thread.                              |
 |                     |                                                                  | Processing Wi-Fi task queue                                    |
 |                     |                                                                  | For Matter over Wi-Fi only.                                    |
 +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+

diff --git a/doc/nrf/protocols/wifi/sap_mode/sap.rst b/doc/nrf/protocols/wifi/sap_mode/sap.rst
@@ -30,7 +30,7 @@ The SAP mode in the nRF70 Series devices provides SoftAP support with the follow
 Enabling the SAP mode
 *********************
 
-You can enable the SAP mode by setting the :kconfig:option:`CONFIG_NRF70_AP_MODE` and :kconfig:option:`CONFIG_WPA_SUPP_AP` Kconfig options in the application project configuration file.
+You can enable the SAP mode by setting the :kconfig:option:`CONFIG_NRF70_AP_MODE` and :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_AP` Kconfig options in the application project configuration file.
 
 
 SAP mode configuration

diff --git a/doc/nrf/protocols/wifi/stack_configuration.rst b/doc/nrf/protocols/wifi/stack_configuration.rst
@@ -63,7 +63,7 @@ The nRF Wi-Fi driver provides the following software configurations to fine-tune
      - Description
      - Impact
      - Purpose
-   * - :kconfig:option:`CONFIG_WPA_SUPP`
+   * - :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT`
      - ``y`` or ``n``
      - Enable or disable Wi-Fi Protected Access (WPA™) supplicant
      - Memory savings
@@ -176,7 +176,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
      - Throughputs
    * - STA scan only
      - Scan only
-     - ``CONFIG_WPA_SUPP=n``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=n``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=1``
@@ -187,7 +187,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
      - ``N/A``
    * - :abbr:`STA (Station)` mode
      - IoT devices
-     - ``CONFIG_WPA_SUPP=y``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=y``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=6``
@@ -208,7 +208,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
        ``UDP-RX: 4.1 Mbps``
    * - :abbr:`STA (Station)` mode
      - Memory optimized :abbr:`STA (Station)` mode
-     - ``CONFIG_WPA_SUPP=y``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=y``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=6``
@@ -229,7 +229,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
        ``UDP-RX: 0.5 Mbps``
    * - :abbr:`STA (Station)` mode
      - High performance :abbr:`STA (Station)` mode
-     - ``CONFIG_WPA_SUPP=y``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=y``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=30``
@@ -249,7 +249,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
        ``UDP-RX: 12.4 Mbps``
    * - :abbr:`STA (Station)` mode
      - TX prioritized :abbr:`STA (Station)` mode
-     - ``CONFIG_WPA_SUPP=y``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=y``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=32``
@@ -270,7 +270,7 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
        ``UDP-RX: 12.8 Mbps``
    * - :abbr:`STA (Station)` mode
      - RX prioritized :abbr:`STA (Station)` mode
-     - ``CONFIG_WPA_SUPP=y``
+     - ``CONFIG_WIFI_NM_WPA_SUPPLICANT=y``
        ``CONFIG_NRF70_AP_MODE=n``
        ``CONFIG_NRF70_P2P_MODE=n``
        ``CONFIG_NET_PKT_TX_COUNT=5``

diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst
@@ -845,7 +845,7 @@ Matter samples
 * Disabled the following features:
 
   * :ref:`ug_matter_configuring_read_client` in most Matter samples using the new :kconfig:option:`CONFIG_CHIP_ENABLE_READ_CLIENT` Kconfig option.
-  * WPA supplicant advanced features in all Matter samples using the :kconfig:option:`CONFIG_WPA_SUPP_ADVANCED_FEATURES` Kconfig option.
+  * WPA supplicant advanced features in all Matter samples using the ``CONFIG_WPA_SUPP_ADVANCED_FEATURES`` Kconfig option.
     This saves roughly 25 KB of flash memory for firmware images with Wi-Fi support.
 
 * Added ``matter_shell`` shell commands set to gather the current information about the NVS settings backend, such as current usage, free space, and peak usage value.

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menuconfig WPA_SUPP
+menuconfig WIFI_NM_WPA_SUPPLICANT
 	bool "WPA supplicant support"
 	# Need full POSIX from libc, Zephyr's POSIX support is only partial
 	select POSIX_CLOCK
@@ -21,7 +21,7 @@ menuconfig WPA_SUPP
 	help
 	  WPA supplicant implements 802.1X related functions.
 
-if WPA_SUPP
+if WIFI_NM_WPA_SUPPLICANT
 
 config COMMON_LIBC_MALLOC_ARENA_SIZE
 	default 40000 if WPA_SUPP_AP
@@ -216,7 +216,7 @@ config NET_MGMT_EVENT_STACK_SIZE
 config NET_SOCKETS_POLL_MAX
 	default 6
 
-module = WPA_SUPP
+module = WIFI_NM_WPA_SUPPLICANT
 module-str = WPA supplicant
 source "subsys/logging/Kconfig.template.log_config"
 
@@ -266,4 +266,4 @@ config WPA_SUPP_NW_SEL_RELIABILITY
 	  Select the network based on reliability.
 endchoice
 
-endif # WPA_SUPP
+endif # WIFI_NM_WPA_SUPPLICANT
diff --git a/modules/wfa-qt/src/wpas_events.c b/modules/wfa-qt/src/wpas_events.c
@@ -28,7 +28,7 @@
 LOG_MODULE_REGISTER(wpas_event, CONFIG_WFA_QT_LOG_LEVEL);
 
 /* TODO: Handle other events */
-#define WPA_SUPP_EVENTS (NET_EVENT_WPA_SUPP_READY)
+#define WPA_SUPP_EVENTS (NET_EVENT_SUPPLICANT_READY)
 
 static struct net_mgmt_event_callback net_wpa_supp_cb;
 
@@ -44,7 +44,7 @@ static void wpa_supp_event_handler(struct net_mgmt_event_callback *cb,
 {
 	/* TODO: Handle other events */
 	switch (mgmt_event) {
-	case NET_EVENT_WPA_SUPP_READY:
+	case NET_EVENT_SUPPLICANT_READY:
 		handle_wpa_supp_ready(cb);
 		break;
 	default:
@@ -55,7 +55,7 @@ static void wpa_supp_event_handler(struct net_mgmt_event_callback *cb,
 
 int wait_for_wpa_s_ready(void)
 {
-	struct wpa_supplicant *wpa_s = z_wpas_get_handle_by_ifname(CONFIG_WFA_QT_DEFAULT_INTERFACE);
+	struct wpa_supplicant *wpa_s = zephyr_get_handle_by_ifname(CONFIG_WFA_QT_DEFAULT_INTERFACE);
 	int ret;
 
 	if (wpa_s) {
@@ -70,7 +70,7 @@ int wait_for_wpa_s_ready(void)
 		return -1;
 	}
 
-	wpa_s = z_wpas_get_handle_by_ifname(CONFIG_WFA_QT_DEFAULT_INTERFACE);
+	wpa_s = zephyr_get_handle_by_ifname(CONFIG_WFA_QT_DEFAULT_INTERFACE);
 	if (!wpa_s) {
 		LOG_INF("WPA Supplicant ready event received, but no handle found for %s",
 			 CONFIG_WFA_QT_DEFAULT_INTERFACE);

diff --git a/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf b/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf
@@ -31,7 +31,7 @@ CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=60
 CONFIG_NEWLIB_LIBC=y
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml
@@ -56,7 +56,7 @@ tests:
       - nrf9160dk/nrf9160/ns
       - nrf9161dk/nrf9161/ns
     extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf
-                CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF70=y
+                CONFIG_WIFI_NM_WPA_SUPPLICANT=n SB_CONFIG_WIFI_NRF70=y
                 SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_samples_cellular
   sample.cellular.location.nrf7001ek_wifi:

diff --git a/samples/cellular/lwm2m_client/overlay-assist-wifi.conf b/samples/cellular/lwm2m_client/overlay-assist-wifi.conf
@@ -41,7 +41,7 @@ CONFIG_WIFI_NRF70=y
 CONFIG_NET_L2_WIFI_MGMT=y
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

diff --git a/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf b/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf
@@ -49,7 +49,7 @@ CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=50
 CONFIG_NEWLIB_LIBC=y
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml
@@ -110,7 +110,7 @@ tests:
       - nrf9160dk/nrf9160/ns
       - nrf9161dk/nrf9161/ns
     extra_args: SHIELD=nrf7002ek_nrf7000 EXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf
-                CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF70=y
+                CONFIG_WIFI_NM_WPA_SUPPLICANT=n SB_CONFIG_WIFI_NRF70=y
                 SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_samples_cellular
   sample.cellular.modem_shell.nrf7001ek_wifi:

diff --git a/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf b/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf
@@ -27,7 +27,7 @@ CONFIG_NET_IF_MAX_IPV4_COUNT=2
 CONFIG_NET_IF_MAX_IPV6_COUNT=2
 
 # But disable the supplicant, since we don't need connectivity
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 CONFIG_MBEDTLS=n
 
 # Stack/heap tweaks needed to support Wi-Fi.

diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf
@@ -120,7 +120,7 @@ CONFIG_FLASH_MAP=y
 ## Enable Wi-Fi networking and native networking stack
 # Note: WPA_SUPP requires 24kB of unused RAM in the final build.
 # Memory allocations in this overlay are fine-tuned with that fact in mind.
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_NATIVE=y
 CONFIG_NRF_SECURITY=y

diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf
@@ -122,7 +122,7 @@ CONFIG_FLASH_MAP=y
 ## Enable Wi-Fi networking and native networking stack
 # Note: WPA_SUPP requires 24kB of unused RAM in the final build.
 # Memory allocations in this overlay are fine-tuned with that fact in mind.
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_NATIVE=y
 CONFIG_NRF_SECURITY=y

diff --git a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -67,8 +67,8 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_INF=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
 
 # Settings subsystem
 CONFIG_NVS=y

diff --git a/samples/matter/lock/prj_thread_wifi_switched.conf b/samples/matter/lock/prj_thread_wifi_switched.conf
@@ -38,7 +38,7 @@ CONFIG_CHIP_FACTORY_RESET_ERASE_NVS=n # Do not restore initial transport on fact
 
 # Reduce application size
 CONFIG_USE_SEGGER_RTT=n
-CONFIG_WPA_SUPP_ADVANCED_FEATURES=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=n
 CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_MATTER_LOG_LEVEL_INF=y
 CONFIG_CHIP_APP_LOG_LEVEL=3

diff --git a/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -35,7 +35,7 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 
 # NET sockets
 CONFIG_NET_L2_ETHERNET=y

diff --git a/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -34,8 +34,8 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR=y
 
 # Zephyr NET Connection Manager Connectivity layer.
 CONFIG_L2_WIFI_CONNECTIVITY=y

diff --git a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -40,7 +40,7 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_MBEDTLS_HEAP_SIZE=16384
 
 # NET sockets

diff --git a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -33,8 +33,8 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR=y
 
 # NET sockets
 CONFIG_NET_L2_ETHERNET=y

diff --git a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -17,7 +17,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=4
 # Wi-Fi
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_NET_L2_ETHERNET=y
 
 # IP address config

diff --git a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -26,8 +26,8 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA supplicant
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR=y
 
 # Zephyr NET Connection Manager connectivity layer
 CONFIG_L2_WIFI_CONNECTIVITY=y

diff --git a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -39,8 +39,8 @@ CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n
 CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n
 
 # WPA
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR=y
 CONFIG_MBEDTLS_HEAP_SIZE=16384
 
 # NET sockets

diff --git a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -23,7 +23,7 @@ CONFIG_SHELL=y
 CONFIG_SHELL_STACK_SIZE=6144
 
 # WPA
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_MBEDTLS_HEAP_SIZE=16384
 
 # NET sockets

diff --git a/samples/wifi/ble_coex/prj.conf b/samples/wifi/ble_coex/prj.conf
@@ -8,7 +8,7 @@ CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 
 # WPA supplicant
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 
 # Networking
 CONFIG_NETWORKING=y

diff --git a/samples/wifi/monitor/prj.conf b/samples/wifi/monitor/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NRF_WIFI_LOW_POWER=n
 CONFIG_NRF70_RAW_DATA_RX=y
 
 # WPA supplicant
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 
 # Networking
 CONFIG_NETWORKING=y

diff --git a/samples/wifi/promiscuous/prj.conf b/samples/wifi/promiscuous/prj.conf
@@ -7,7 +7,7 @@ CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 
 # WPA supplicant
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 
 # Promiscuous mode
 CONFIG_NET_PROMISCUOUS_MODE=y

diff --git a/samples/wifi/provisioning/ble/prj.conf b/samples/wifi/provisioning/ble/prj.conf
@@ -7,7 +7,7 @@ CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 
 # WPA supplicant
-CONFIG_WPA_SUPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 
 # Networking
 CONFIG_NETWORKING=y