diff --git a/fw_if/umac_if/inc/common/fmac_util.h b/fw_if/umac_if/inc/common/fmac_util.h index f1a8f91..325fe31 100644 --- a/fw_if/umac_if/inc/common/fmac_util.h +++ b/fw_if/umac_if/inc/common/fmac_util.h @@ -14,6 +14,9 @@ #include "fmac_structs_common.h" #include "fmac_structs_common.h" +#ifdef NRF70_SYSTEM_MODE +#include "system/fmac_structs.h" +#endif /* NRF70_SYSTEM_MODE */ #include "common/pack_def.h" @@ -107,4 +110,8 @@ bool nrf_wifi_util_is_arr_zero(unsigned char *arr, void *wifi_fmac_priv(struct nrf_wifi_fmac_priv *def); void *wifi_dev_priv(struct nrf_wifi_fmac_dev_ctx *def); +#ifdef NRF70_SYSTEM_MODE +unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif, void *nwb); +#endif /* NRF70_SYSTEM_MODE */ + #endif /* __FMAC_UTIL_H__ */ diff --git a/fw_if/umac_if/inc/fw/patch_info.h b/fw_if/umac_if/inc/fw/patch_info.h index 4235f01..e981e5e 100644 --- a/fw_if/umac_if/inc/fw/patch_info.h +++ b/fw_if/umac_if/inc/fw/patch_info.h @@ -62,7 +62,7 @@ struct nrf70_fw_image_info { #define RPU_FAMILY (1) #define RPU_MAJOR_VERSION (2) #define RPU_MINOR_VERSION (14) -#define RPU_PATCH_VERSION (4) +#define RPU_PATCH_VERSION (5) /** * @} diff --git a/fw_if/umac_if/inc/system/fmac_structs.h b/fw_if/umac_if/inc/system/fmac_structs.h index b22766f..c472dc9 100644 --- a/fw_if/umac_if/inc/system/fmac_structs.h +++ b/fw_if/umac_if/inc/system/fmac_structs.h @@ -326,6 +326,8 @@ struct peers_info { unsigned int pairwise_cipher; /** 802.11 power save token count. */ int ps_token_count; + /** Port authorized */ + bool authorized; }; /** diff --git a/fw_if/umac_if/src/common/fmac_util.c b/fw_if/umac_if/src/common/fmac_util.c index 28b162f..3094316 100644 --- a/fw_if/umac_if/src/common/fmac_util.c +++ b/fw_if/umac_if/src/common/fmac_util.c @@ -18,6 +18,9 @@ #else #include "host_rpu_umac_if.h" #endif +#ifdef NRF70_SYSTEM_MODE +#include +#endif /* NRF70_SYSTEM_MODE */ bool nrf_wifi_util_is_multicast_addr(const unsigned char *addr) { @@ -91,6 +94,26 @@ bool nrf_wifi_util_is_arr_zero(unsigned char *arr, return true; } +#ifdef NRF70_SYSTEM_MODE +unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif, + void *nwb) +{ + if ((vif->if_type == NRF_WIFI_IFTYPE_STATION) +#ifdef NRF70_RAW_DATA_TX + || (vif->if_type == NRF_WIFI_STA_TX_INJECTOR) +#endif /* NRF70_RAW_DATA_TX */ +#ifdef NRF70_PROMISC_DATA_RX + || (vif->if_type == NRF_WIFI_STA_PROMISC) + || (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR) +#endif + ) { + return vif->bssid; + } + + return nrf_wifi_osal_nbuf_data_get(nwb); +} +#endif /* NRF70_SYSTEM_MODE */ + void *wifi_fmac_priv(struct nrf_wifi_fmac_priv *def) { return &def->priv; diff --git a/fw_if/umac_if/src/system/tx.c b/fw_if/umac_if/src/system/tx.c index e807098..27a7a92 100644 --- a/fw_if/umac_if/src/system/tx.c +++ b/fw_if/umac_if/src/system/tx.c @@ -1864,25 +1864,6 @@ static int get_ac(unsigned int tid, } -unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif, - void *nwb) -{ - if ((vif->if_type == NRF_WIFI_IFTYPE_STATION) -#ifdef NRF70_RAW_DATA_TX - || (vif->if_type == NRF_WIFI_STA_TX_INJECTOR) -#endif /* NRF70_RAW_DATA_TX */ -#ifdef NRF70_PROMISC_DATA_RX - || (vif->if_type == NRF_WIFI_STA_PROMISC) - || (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR) -#endif - ) { - return vif->bssid; - } - - return nrf_wifi_osal_nbuf_data_get(nwb); -} - - #ifdef NRF70_RAW_DATA_TX static bool nrf_wifi_raw_pkt_mode_enabled(struct nrf_wifi_fmac_vif_ctx *vif) { diff --git a/zephyr/module.yml b/zephyr/module.yml index e402c1d..c2cf17d 100644 --- a/zephyr/module.yml +++ b/zephyr/module.yml @@ -1,4 +1,4 @@ -# Generated from commit: 8f3c1e8d91a8c5f53301cf82d9ece4facc63e633 +# Generated from PR #1930 (commit: cdb6c149a2915a46ee7894b6924740f77cb8ed01) # Auto-generated file, do not edit, use update_blobs.py to update name: nrf_wifi build: @@ -7,46 +7,46 @@ build: blobs: - path: wifi_fw_bins/default/nrf70.bin - sha256: a75865e8b1c0ed34754de65c41513eeee299f2e8ef49246bd671497b3bb71368 + sha256: d9c99ba5ff00df18deb6c568ec2cd942628b40772b9454101de68e80475b14ff type: img - version: '1.2.14.4' + version: '1.2.14.5' license-path: ./LICENSE.txt - url: https://github.com/nrfconnect/sdk-nrfxlib/raw/8f3c1e8d91a8c5f53301cf82d9ece4facc63e633/nrf_wifi/bin/zephyr/default/nrf70.bin + url: https://github.com/nrfconnect/sdk-nrfxlib/raw/cdb6c149a2915a46ee7894b6924740f77cb8ed01/nrf_wifi/bin/zephyr/default/nrf70.bin description: nRF70 Wi-Fi firmware for default mode doc-url: https://docs.nordicsemi.com/bundle/ps_nrf7000/page/chapters/notice/doc/notice_on_sw.html - path: wifi_fw_bins/scan_only/nrf70.bin - sha256: d0d6b685f38d13b5cbbadb0e8e8fb82d1bf43a2670ee31b34117d3e5913555e1 + sha256: 7663f6f9e320f50d4c24d5c9e7bd43c207769e0fb9237a602edb9be32ebaa294 type: img - version: '1.2.14.4' + version: '1.2.14.5' license-path: ./LICENSE.txt - url: https://github.com/nrfconnect/sdk-nrfxlib/raw/8f3c1e8d91a8c5f53301cf82d9ece4facc63e633/nrf_wifi/bin/zephyr/scan_only/nrf70.bin + url: https://github.com/nrfconnect/sdk-nrfxlib/raw/cdb6c149a2915a46ee7894b6924740f77cb8ed01/nrf_wifi/bin/zephyr/scan_only/nrf70.bin description: nRF70 Wi-Fi firmware for scan_only mode doc-url: https://docs.nordicsemi.com/bundle/ps_nrf7000/page/chapters/notice/doc/notice_on_sw.html - path: wifi_fw_bins/radio_test/nrf70.bin - sha256: 333b4ebda45b235637968c8faaeacaca769f6c298ea4fcc704edc9702ea1af63 + sha256: ec0a847885aa7a75f58d0857b9612b196792da5e2e5f68362d5e019cf9212a8a type: img - version: '1.2.14.4' + version: '1.2.14.5' license-path: ./LICENSE.txt - url: https://github.com/nrfconnect/sdk-nrfxlib/raw/8f3c1e8d91a8c5f53301cf82d9ece4facc63e633/nrf_wifi/bin/zephyr/radio_test/nrf70.bin + url: https://github.com/nrfconnect/sdk-nrfxlib/raw/cdb6c149a2915a46ee7894b6924740f77cb8ed01/nrf_wifi/bin/zephyr/radio_test/nrf70.bin description: nRF70 Wi-Fi firmware for radio_test mode doc-url: https://docs.nordicsemi.com/bundle/ps_nrf7000/page/chapters/notice/doc/notice_on_sw.html - path: wifi_fw_bins/system_with_raw/nrf70.bin - sha256: dbf8716654fb66bb5618779760f73e2ece3415eb831c7b72417b5cb65c0ce136 + sha256: eb326ba7d9851490b864385e02bec1a2e5bb55408b4b950011aec397b9b8d88a type: img - version: '1.2.14.4' + version: '1.2.14.5' license-path: ./LICENSE.txt - url: https://github.com/nrfconnect/sdk-nrfxlib/raw/8f3c1e8d91a8c5f53301cf82d9ece4facc63e633/nrf_wifi/bin/zephyr/system_with_raw/nrf70.bin + url: https://github.com/nrfconnect/sdk-nrfxlib/raw/cdb6c149a2915a46ee7894b6924740f77cb8ed01/nrf_wifi/bin/zephyr/system_with_raw/nrf70.bin description: nRF70 Wi-Fi firmware for system_with_raw mode doc-url: https://docs.nordicsemi.com/bundle/ps_nrf7000/page/chapters/notice/doc/notice_on_sw.html - path: wifi_fw_bins/offloaded_raw_tx/nrf70.bin - sha256: 8a544bd70de5b4904790aa69a479235ec570470aa6ac4fd558b2233cfe895ac8 + sha256: 4b15de2e067a9442df750c172775a7482e83fc852c660a2db37284d87f1d85e0 type: img - version: '1.2.14.4' + version: '1.2.14.5' license-path: ./LICENSE.txt - url: https://github.com/nrfconnect/sdk-nrfxlib/raw/8f3c1e8d91a8c5f53301cf82d9ece4facc63e633/nrf_wifi/bin/zephyr/offloaded_raw_tx/nrf70.bin + url: https://github.com/nrfconnect/sdk-nrfxlib/raw/cdb6c149a2915a46ee7894b6924740f77cb8ed01/nrf_wifi/bin/zephyr/offloaded_raw_tx/nrf70.bin description: nRF70 Wi-Fi firmware for offloaded_raw_tx mode doc-url: https://docs.nordicsemi.com/bundle/ps_nrf7000/page/chapters/notice/doc/notice_on_sw.html