From 6381aab7e01a3ada95d34a7f2124206b0e9187f2 Mon Sep 17 00:00:00 2001 From: Damian Krolik Date: Thu, 15 May 2025 10:43:57 +0200 Subject: [PATCH 1/2] [nrf fromlist] net: lib: zperf: fix compilation with UDP/TCP only Fix regression introduced by #88747 that breaks linking with zperf server enabled but TCP or UDP disabled. Upstream PR #: 89988 Signed-off-by: Damian Krolik --- subsys/net/lib/zperf/zperf_shell.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/subsys/net/lib/zperf/zperf_shell.c b/subsys/net/lib/zperf/zperf_shell.c index d92a7aaa9d1..012fe2231ba 100644 --- a/subsys/net/lib/zperf/zperf_shell.c +++ b/subsys/net/lib/zperf/zperf_shell.c @@ -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"); @@ -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"); From 3ad008456d10cf9ff5a0ddb2aa65f16b500d4e08 Mon Sep 17 00:00:00 2001 From: Damian Krolik Date: Thu, 15 May 2025 10:47:35 +0200 Subject: [PATCH 2/2] [nrf fromlist] manifest: update hal_nordic revision to pull in #293 Pull in clang compilation error fix. Upstream PR #: 89989 Signed-off-by: Damian Krolik --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 1b3f7063b7a..95daefdf50d 100644 --- a/west.yml +++ b/west.yml @@ -198,7 +198,7 @@ manifest: groups: - hal - name: hal_nordic - revision: a5a2277d4399939e9aa67a71ca9eb411c85a1a7d + revision: 243c6708278364516c6ca1dcccc00c5f721095fa path: modules/hal/nordic groups: - hal