From 74b7437bd118e104f50831f8a8f3cc8d10aa2530 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 28 Mar 2019 16:31:52 -0700 Subject: [PATCH] tcp: remove sent rcv wnd 0 flag Change-Id: If6c672d1caa8884eb5d819311606a79a3de81200 Signed-off-by: Florin Coras --- src/vnet/tcp/tcp.h | 1 - src/vnet/tcp/tcp_input.c | 4 ++-- src/vnet/tcp/tcp_output.c | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index d9f49df6d32..8383d014276 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -117,7 +117,6 @@ extern timer_expiration_handler tcp_timer_retransmit_syn_handler; #define foreach_tcp_connection_flag \ _(SNDACK, "Send ACK") \ _(FINSNT, "FIN sent") \ - _(SENT_RCV_WND0, "Sent 0 rcv_wnd") \ _(RECOVERY, "Recovery") \ _(FAST_RECOVERY, "Fast Recovery") \ _(DCNT_PENDING, "Disconnect pending") \ diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index c27631f3965..cc630f8ae5f 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -1876,8 +1876,8 @@ tcp_can_delack (tcp_connection_t * tc) { /* Send ack if ... */ if (TCP_ALWAYS_ACK - /* just sent a rcv wnd 0 */ - || (tc->flags & TCP_CONN_SENT_RCV_WND0) != 0 + /* just sent a rcv wnd 0 + || (tc->flags & TCP_CONN_SENT_RCV_WND0) != 0 */ /* constrained to send ack */ || (tc->flags & TCP_CONN_SNDACK) != 0 /* we're almost out of tx wnd */ diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index b1e848c5376..518a80de65e 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -183,16 +183,6 @@ tcp_window_to_advertise (tcp_connection_t * tc, tcp_state_t state) return tcp_initial_window_to_advertise (tc); tcp_update_rcv_wnd (tc); - - if (tc->rcv_wnd == 0) - { - tc->flags |= TCP_CONN_SENT_RCV_WND0; - } - else - { - tc->flags &= ~TCP_CONN_SENT_RCV_WND0; - } - return tc->rcv_wnd >> tc->rcv_wscale; } -- 2.16.6