Skip to content

Cherry-pick two fromlist commits required by protocols serialization #2871

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

Merged
merged 2 commits into from
May 15, 2025
Merged

Cherry-pick two fromlist commits required by protocols serialization #2871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6381aab
[nrf fromlist] net: lib: zperf: fix compilation with UDP/TCP only
Damian-Nordic May 15, 2025
3ad0084
[nrf fromlist] manifest: update hal_nordic revision to pull in #293
Damian-Nordic May 15, 2025
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
10 changes: 10 additions & 0 deletions subsys/net/lib/zperf/zperf_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,11 @@ static int cmd_udp_download_stop(const struct shell *sh, size_t argc,
{
int ret;

if (!IS_ENABLED(CONFIG_NET_UDP)) {
shell_warn(sh, "UDP not supported");
return -ENOEXEC;
}

ret = zperf_udp_download_stop();
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING, "UDP server not running!\n");
Expand Down Expand Up @@ -1492,6 +1497,11 @@ static int cmd_tcp_download_stop(const struct shell *sh, size_t argc,
{
int ret;

if (!IS_ENABLED(CONFIG_NET_TCP)) {
shell_warn(sh, "TCP not supported");
return -ENOEXEC;
}

ret = zperf_tcp_download_stop();
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING, "TCP server not running!\n");
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 @@ -198,7 +198,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: a5a2277d4399939e9aa67a71ca9eb411c85a1a7d
revision: 243c6708278364516c6ca1dcccc00c5f721095fa
path: modules/hal/nordic
groups:
- hal
Expand Down