This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 352844e2dfee1bf679639ee31142b5d2b9e2daf7 Author: yangjianqing <[email protected]> AuthorDate: Thu Jan 22 14:51:49 2026 +0800 net/tcp: Fixed the compilation error without CONFIG_NET_TCP_FAST_RETRANSMIT TCP_WBNACK depends on CONFIG_NET_TCP_FAST_RETRANSMIT being enabled. If CONFIG_NET_TCP_FAST_RETRANSMIT is disabled, the definition of TCP_WBNACK will not be found. Signed-off-by: yangjianqing <[email protected]> --- net/tcp/tcp_send_buffered.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 3f9b8c3bc4e..087418547fc 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -594,7 +594,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, { #ifdef CONFIG_NET_TCP_CC_NEWRENO if (conn->dupacks >= TCP_FAST_RETRANSMISSION_THRESH) -#else +#elif defined(CONFIG_NET_TCP_FAST_RETRANSMIT) /* Duplicate ACK? Retransmit data if need */ if (++TCP_WBNACK(wrb) == TCP_FAST_RETRANSMISSION_THRESH) @@ -602,21 +602,22 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, { /* Fast retransmission has been triggered */ -#ifndef CONFIG_NET_TCP_CC_NEWRENO +#if defined(CONFIG_NET_TCP_FAST_RETRANSMIT) && !defined(CONFIG_NET_TCP_CC_NEWRENO) /* Reset counter */ TCP_WBNACK(wrb) = 0; #endif +#ifdef CONFIG_NET_TCP_FAST_RETRANSMIT if ((flags & TCP_NEWDATA) != 0) { FAR uint8_t *buf = dev->d_buf; FAR uint8_t *appdata = dev->d_appdata; uint16_t len = dev->d_len; -#ifdef CONFIG_NET_TCPURGDATA +# ifdef CONFIG_NET_TCPURGDATA FAR uint8_t *urgdata = dev->d_urgdata; uint16_t urglen = dev->d_urglen; -#endif +# endif FAR struct iob_s *iob = dev->d_iob; dev->d_buf = NULL; @@ -633,12 +634,13 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, dev->d_buf = buf; dev->d_appdata = appdata; dev->d_len = len; -#ifdef CONFIG_NET_TCPURGDATA +# ifdef CONFIG_NET_TCPURGDATA dev->d_urgdata = urgdata; dev->d_urglen = urglen; -#endif +# endif return flags; } +#endif #ifdef CONFIG_NET_TCP_SELECTIVE_ACK if ((conn->flags & TCP_SACK) &&
