[Backport v4.0.99-ncs1-branch] wifi: Upmerge 3 (fixes only)

boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi

@@ -134,6 +134,11 @@
 	status = "okay";
 };
 
+&lfxo {
+	load-capacitors = "internal";
+	load-capacitance-picofarad = <7>;
+};
+
 &adc {
 	status = "okay";
 };

doc/connectivity/networking/api/wifi.rst

@@ -42,31 +42,16 @@ Test certificates in PEM format are committed to the repo at :zephyr_file:`sampl
 build process the certificates are converted to a C header file that is included by the Wi-Fi shell
 module.
 
-If you want to use your own certificates, you can replace the existing certificates with your own certificates in the same directory.
-
 .. code-block:: bash
 
-    $ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa3k
-    $ cp client.pem $WIFI_TEST_CERTS_DIR
-    $ cp client-key.pem $WIFI_TEST_CERTS_DIR
-    $ cp ca.pem $WIFI_TEST_CERTS_DIR
-    $ cp client2.pem $WIFI_TEST_CERTS_DIR
-    $ cp client-key2.pem $WIFI_TEST_CERTS_DIR
-    $ cp ca2.pem $WIFI_TEST_CERTS_DIR
+    $ cp client.pem samples/net/wifi/test_certs/
+    $ cp client-key.pem samples/net/wifi/test_certs/
+    $ cp ca.pem samples/net/wifi/test_certs/
+    $ cp client2.pem samples/net/wifi/test_certs/
+    $ cp client-key2.pem samples/net/wifi/test_certs/
+    $ cp ca2.pem samples/net/wifi/test_certs/
     $ west build -p -b <board> samples/net/wifi -S wifi-enterprise
 
-or alternatively copy ``rsa2k`` certificates by changing the ``WIFI_TEST_CERTS_DIR`` environment variable.
-
-.. code-block:: bash
-
-    $ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa2k
-
-or you can set the :envvar:`WIFI_TEST_CERTS_DIR` environment variable to point to the directory containing your certificates.
-
-.. code-block:: bash
-
-    $ west build -p -b <board> samples/net/wifi -S wifi-enterprise -- -DWIFI_TEST_CERTS_DIR=<path_to_your_certificates>
-
 Run time certificates
 ---------------------
 
@@ -77,7 +62,7 @@ To facilitate installation of the certificates, a helper script is provided in t
 
 .. code-block:: bash
 
-    $ samples/net/wifi/test_certs/install_certs.py -p samples/net/wifi/test_certs/rsa2k
+    $ ./scripts/utils/wifi_ent_cert_installer.py -p samples/net/wifi/test_certs/rsa2k
 
 The script will install the certificates in the ``rsa2k`` directory to the TLS credentials store in the device over UART and using TLS credentials shell commands.
 

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -546,7 +546,8 @@ config NRF_WIFI_CTRL_HEAP_SIZE
 
 config NRF_WIFI_DATA_HEAP_SIZE
 	int "Dedicated memory pool for data plane"
-	default 8000 if NRF70_SCAN_ONLY || NRF70_RADIO_TEST #TODO: Need to optimize this.
+	default 0 if NRF70_RADIO_TEST || NRF70_OFFLOADED_RAW_TX
+	default 8000 if NRF70_SCAN_ONLY
 	default 110000 if !SOC_FAMILY_NORDIC_NRF
 	default 130000
 

drivers/wifi/nrf_wifi/src/wpa_supp_if.c

@@ -396,6 +396,10 @@ void nrf_wifi_wpa_supp_event_proc_deauth(void *if_priv,
 		event.deauth_info.ie_len = (frame + frame_len - mgmt->u.deauth.variable);
 	}
 
+	if (!(deauth->valid_fields & NRF_WIFI_EVENT_MLME_RXDEAUTH_FROM_AP)) {
+		event.deauth_info.locally_generated = 1;
+	}
+
 	if (vif_ctx_zep->supp_drv_if_ctx && vif_ctx_zep->supp_callbk_fns.deauth) {
 		vif_ctx_zep->supp_callbk_fns.deauth(vif_ctx_zep->supp_drv_if_ctx,
 			&event, mgmt);

modules/nrf_wifi/os/shim.c

@@ -575,11 +575,32 @@ static void *zep_shim_llist_node_alloc(void)
 	return llist_node;
 }
 
+static void *zep_shim_ctrl_llist_node_alloc(void)
+{
+	struct zep_shim_llist_node *llist_node = NULL;
+
+	llist_node = zep_shim_mem_zalloc(sizeof(*llist_node));
+
+	if (!llist_node) {
+		LOG_ERR("%s: Unable to allocate memory for linked list node", __func__);
+		return NULL;
+	}
+
+	sys_dnode_init(&llist_node->head);
+
+	return llist_node;
+}
+
 static void zep_shim_llist_node_free(void *llist_node)
 {
 	zep_shim_data_mem_free(llist_node);
 }
 
+static void zep_shim_ctrl_llist_node_free(void *llist_node)
+{
+	zep_shim_mem_free(llist_node);
+}
+
 static void *zep_shim_llist_node_data_get(void *llist_node)
 {
 	struct zep_shim_llist_node *zep_llist_node = NULL;
@@ -1071,7 +1092,9 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.log_err = zep_shim_pr_err,
 
 	.llist_node_alloc = zep_shim_llist_node_alloc,
+	.ctrl_llist_node_alloc = zep_shim_ctrl_llist_node_alloc,
 	.llist_node_free = zep_shim_llist_node_free,
+	.ctrl_llist_node_free = zep_shim_ctrl_llist_node_free,
 	.llist_node_data_get = zep_shim_llist_node_data_get,
 	.llist_node_data_set = zep_shim_llist_node_data_set,