From 265b2099c7715a3432eef00acd1faea7cbc1eb25 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 18 Sep 2024 11:53:06 +1000 Subject: [PATCH] tcp: Simplify ifdef logic in tcp_update_seqack_wnd() This function has a block conditional on !snd_wnd_cap shortly before an snd_wnd_cap is statically false). Therefore, simplify this down to a single conditional with an else branch. While we're there, fix some improperly indented closing braces. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tcp.c b/tcp.c index cba3f3b..92ac164 100644 --- a/tcp.c +++ b/tcp.c @@ -1066,14 +1066,13 @@ int tcp_update_seqack_wnd(const struct ctx *c, struct tcp_tap_conn *conn, if (!tinfo) { if (prev_wnd_to_tap > WINDOW_DEFAULT) { goto out; -} + } tinfo = &tinfo_new; if (getsockopt(s, SOL_TCP, TCP_INFO, tinfo, &sl)) { goto out; -} + } } -#ifdef HAS_SND_WND if ((conn->flags & LOCAL) || tcp_rtt_dst_low(conn)) { new_wnd_to_tap = tinfo->tcpi_snd_wnd; } else { @@ -1081,7 +1080,6 @@ int tcp_update_seqack_wnd(const struct ctx *c, struct tcp_tap_conn *conn, new_wnd_to_tap = MIN((int)tinfo->tcpi_snd_wnd, SNDBUF_GET(conn)); } -#endif new_wnd_to_tap = MIN(new_wnd_to_tap, MAX_WINDOW); if (!(conn->events & ESTABLISHED))