Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v3.7.99-ncs1-branch] wifi: Pull fixes for RC2 #2198

Merged
merged 8 commits into from
Oct 30, 2024
Merged

[Backport v3.7.99-ncs1-branch] wifi: Pull fixes for RC2 #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4002738
[nrf fromlist] manifest: hal_nordic: Pull doxygen build fixes
krish2718 Oct 28, 2024
3f84dab
[nrf fromlist] drivers: wifi: Fix offloaded raw TX feature flags
kapbh Oct 23, 2024
f1d8507
[nrf fromlist] drivers: wifi: Fix deinit for offloaded raw tx API
kapbh Oct 23, 2024
a3fa6df
[nrf fromlist] drivers: nrfwifi: Remove passing unused flag
krish2718 Oct 28, 2024
adf1c61
[nrf fromlist] boards: nordic: Fix the label for nRF70 SR co-existence
krish2718 Oct 26, 2024
c6d8f5d
[nrf fromlist] shields: nrf7002eb: Add missing SR RF switch GPIO
krish2718 Oct 27, 2024
58451f5
[nrf fromlist] drivers: nrfwifi: Fix memory leak in TX path
krish2718 Oct 28, 2024
556866c
[nrf fromtree] net: lib: capture: Fix build error
krish2718 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<21 0 &gpio1 3 0>; /* D15 */
};

nrf70: coex {
nrf_radio_coex: coex {
status = "okay";
compatible = "nordic,nrf7002-coex";

Expand Down
1 change: 1 addition & 0 deletions boards/shields/nrf7002eb/nrf7002eb.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
bucken-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
iovdd-ctrl-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
host-irq-gpios = <&edge_connector 19 GPIO_ACTIVE_HIGH>;
srrf-switch-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

wlan0: wlan0 {
compatible = "nordic,wlan";
Expand Down
2 changes: 1 addition & 1 deletion boards/shields/nrf7002eb/nrf7002eb_coex.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/ {
nrf70: coex {
nrf_radio_coex: coex {
compatible = "nordic,nrf7002-coex";
status = "okay";

Expand Down
2 changes: 1 addition & 1 deletion boards/shields/nrf7002ek/nrf7002ek_coex.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/ {
nrf70: coex {
nrf_radio_coex: coex {
compatible = "nordic,nrf7002-coex";
status = "okay";

Expand Down
3 changes: 2 additions & 1 deletion drivers/wifi/nrfwifi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ zephyr_compile_definitions(
-DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-DNRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
Expand Down Expand Up @@ -344,4 +343,6 @@ zephyr_compile_definitions(
-DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-DNRF_NRF70_OFFLOADED_RAW_TX=${CONFIG_NRF70_OFFLOADED_RAW_TX}
-DNRF70_PASSIVE_SCAN_ONLY=${CONFIG_NRF70_PASSIVE_SCAN_ONLY}
)
1 change: 0 additions & 1 deletion drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ void nrf70_off_raw_tx_deinit(void)
}

nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
nrf_wifi_osal_deinit();

k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
}
Expand Down
8 changes: 6 additions & 2 deletions drivers/wifi/nrfwifi/src/net_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ int nrf_wifi_if_send(const struct device *dev,
#ifdef CONFIG_NRF70_RAW_DATA_TX
if ((*(unsigned int *)pkt->frags->data) == NRF_WIFI_MAGIC_NUM_RAWTX) {
if (vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) {
goto unlock;
goto drop;
}

ret = nrf_wifi_fmac_start_rawpkt_xmit(rpu_ctx_zep->rpu_ctx,
Expand All @@ -399,7 +399,7 @@ int nrf_wifi_if_send(const struct device *dev,
#endif /* CONFIG_NRF70_RAW_DATA_TX */
if ((vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) ||
(!vif_ctx_zep->authorized && !is_eapol(pkt))) {
goto unlock;
goto drop;
}

ret = nrf_wifi_fmac_start_xmit(rpu_ctx_zep->rpu_ctx,
Expand All @@ -408,6 +408,10 @@ int nrf_wifi_if_send(const struct device *dev,
#ifdef CONFIG_NRF70_RAW_DATA_TX
}
#endif /* CONFIG_NRF70_RAW_DATA_TX */
goto unlock;
drop:
host_stats->total_tx_drop_pkts++;
nrf_wifi_osal_nbuf_free(nbuf);
unlock:
k_mutex_unlock(&vif_ctx_zep->vif_lock);
#else
Expand Down
3 changes: 2 additions & 1 deletion subsys/net/lib/capture/capture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
NET_BUF_POOL_FIXED_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
CONFIG_NET_BUF_DATA_SIZE, 4, NULL);
#else
#define DATA_POOL_SIZE MAX(NET_PKT_BUF_RX_DATA_POOL_SIZE, NET_PKT_BUF_TX_DATA_POOL_SIZE)
#define DATA_POOL_SIZE MAX(CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE, \
CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE)

Check notice on line 47 in subsys/net/lib/capture/capture.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/net/lib/capture/capture.c:47 
-#define DATA_POOL_SIZE MAX(CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE, \
-			   CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE)
+#define DATA_POOL_SIZE                                                                             \
+	MAX(CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE, CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE)
NET_BUF_POOL_VAR_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
DATA_POOL_SIZE, 4, NULL);
#endif
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73
revision: c1c448df1b751c1c03229a447a2216f29e6aaf99
path: modules/hal/nordic
groups:
- hal
Expand Down
Loading