Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7781a6e authored by Andrew Vagin's avatar Andrew Vagin Committed by David S. Miller
Browse files

tcp: initialize rcv_tstamp for restored sockets 



u32 rcv_tstamp;     /* timestamp of last received ACK */

Its value used in tcp_retransmit_timer, which closes socket
if the last ack was received more then TCP_RTO_MAX ago.

Currently rcv_tstamp is initialized to zero and if tcp_retransmit_timer
is called before receiving a first ack, the connection is closed.

This patch initializes rcv_tstamp to a timestamp, when a socket was
restored.

Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Reported-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 282a1dff

net/ipv4/tcp_output.c

+2 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,8 @@ void tcp_connect_init(struct sock *sk) 


	if (likely(!tp->repair))

		tp->rcv_nxt = 0;

	else

		tp->rcv_tstamp = tcp_time_stamp;

	tp->rcv_wup = tp->rcv_nxt;

	tp->copied_seq = tp->rcv_nxt;