| From foo@baz Thu 06 Feb 2020 06:56:59 AM GMT |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Fri, 31 Jan 2020 10:22:47 -0800 |
| Subject: tcp: clear tp->delivered in tcp_disconnect() |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ Upstream commit 2fbdd56251b5c62f96589f39eded277260de7267 ] |
| |
| tp->delivered needs to be cleared in tcp_disconnect(). |
| |
| tcp_disconnect() is rarely used, but it is worth fixing it. |
| |
| Fixes: ddf1af6fa00e ("tcp: new delivery accounting") |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Cc: Yuchung Cheng <ycheng@google.com> |
| Cc: Neal Cardwell <ncardwell@google.com> |
| Acked-by: Yuchung Cheng <ycheng@google.com> |
| Acked-by: Neal Cardwell <ncardwell@google.com> |
| Acked-by: Soheil Hassas Yeganeh <soheil@google.com> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/tcp.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/net/ipv4/tcp.c |
| +++ b/net/ipv4/tcp.c |
| @@ -2588,6 +2588,7 @@ int tcp_disconnect(struct sock *sk, int |
| tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; |
| tp->snd_cwnd_cnt = 0; |
| tp->window_clamp = 0; |
| + tp->delivered = 0; |
| tp->delivered_ce = 0; |
| tcp_set_ca_state(sk, TCP_CA_Open); |
| tp->is_sack_reneg = 0; |