This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 150e52769ba25148ab8dfe165871036801356ad9 Author: zhanghongyu <[email protected]> AuthorDate: Tue Apr 29 21:27:28 2025 +0800 net/udp: fix build error when NET_UDP_WRITE_BUFFERS disable fix build error. Signed-off-by: zhanghongyu <[email protected]> --- net/procfs/net_udp.c | 4 ++-- net/udp/udp.h | 2 -- net/udp/udp_ioctl.c | 16 ++++++++++------ net/udp/udp_wrbuffer.c | 2 -- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/procfs/net_udp.c b/net/procfs/net_udp.c index ebff83e3a89..6bae9e75831 100644 --- a/net/procfs/net_udp.c +++ b/net/procfs/net_udp.c @@ -95,13 +95,13 @@ static ssize_t netprocfs_udpstats(FAR struct netprocfs_file_s *priv, len += snprintf(buffer + len, buflen - len, " %2" PRIu8 ": %3" PRIx8 -#if CONFIG_NET_SEND_BUFSIZE > 0 +#ifdef CONFIG_NET_UDP_WRITE_BUFFERS " %6" PRIu32 #endif " %6u", priv->offset++, conn->sconn.s_flags, -#if CONFIG_NET_SEND_BUFSIZE > 0 +#ifdef CONFIG_NET_UDP_WRITE_BUFFERS udp_wrbuffer_inqueue_size(conn), #endif (conn->readahead) ? conn->readahead->io_pktlen : 0); diff --git a/net/udp/udp.h b/net/udp/udp.h index b60295cd400..369d6200596 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -579,9 +579,7 @@ void udp_wrbuffer_release(FAR struct udp_wrbuffer_s *wrb); * ****************************************************************************/ -#if CONFIG_NET_SEND_BUFSIZE > 0 uint32_t udp_wrbuffer_inqueue_size(FAR struct udp_conn_s *conn); -#endif /* CONFIG_NET_SEND_BUFSIZE */ /**************************************************************************** * Name: udp_wrbuffer_test diff --git a/net/udp/udp_ioctl.c b/net/udp/udp_ioctl.c index 39b74cb1956..df26d5a45d4 100644 --- a/net/udp/udp_ioctl.c +++ b/net/udp/udp_ioctl.c @@ -67,25 +67,29 @@ static void udp_path(FAR struct udp_conn_s *conn, FAR char *buf, size_t len) snprintf(buf, len, "udp:[" "%s:%" PRIu16 "<->%s:%" PRIu16 -#if CONFIG_NET_SEND_BUFSIZE > 0 ", tx %" PRIu32 "/%" PRId32 -#endif -#if CONFIG_NET_RECV_BUFSIZE > 0 ", rx %u/%" PRId32 -#endif ", flg %" PRIx8 "]", inet_ntop(domain, laddr, local, sizeof(local)), ntohs(conn->lport), inet_ntop(domain, raddr, remote, sizeof(remote)), ntohs(conn->rport), -#if CONFIG_NET_SEND_BUFSIZE > 0 +#ifdef CONFIG_NET_UDP_WRITE_BUFFERS udp_wrbuffer_inqueue_size(conn), +#else + (uint32_t)0, +#endif +#if CONFIG_NET_SEND_BUFSIZE > 0 conn->sndbufs, +#else + (int32_t)0, #endif -#if CONFIG_NET_RECV_BUFSIZE > 0 (conn->readahead) ? conn->readahead->io_pktlen : 0, +#if CONFIG_NET_RECV_BUFSIZE > 0 conn->rcvbufs, +#else + (int32_t)0, #endif conn->sconn.s_flags ); diff --git a/net/udp/udp_wrbuffer.c b/net/udp/udp_wrbuffer.c index c967d216e93..176f99142bb 100644 --- a/net/udp/udp_wrbuffer.c +++ b/net/udp/udp_wrbuffer.c @@ -262,7 +262,6 @@ void udp_wrbuffer_release(FAR struct udp_wrbuffer_s *wrb) * ****************************************************************************/ -#if CONFIG_NET_SEND_BUFSIZE > 0 uint32_t udp_wrbuffer_inqueue_size(FAR struct udp_conn_s *conn) { FAR struct udp_wrbuffer_s *wrb; @@ -280,7 +279,6 @@ uint32_t udp_wrbuffer_inqueue_size(FAR struct udp_conn_s *conn) return total; } -#endif /* CONFIG_NET_SEND_BUFSIZE */ /**************************************************************************** * Name: udp_wrbuffer_test
