Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c7781a6e3c4a9a17e144ec2db00ebfea327bd627

Authored by Andrew Vagin
Committed by David S. Miller
1 parent 282a1dffc1
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

net/ipv4/tcp_output.c
Diff comments   View file @ c7781a6
... ... @@ -2814,6 +2814,8 @@
2814 2814  
2815 2815 if (likely(!tp->repair))
2816 2816 tp->rcv_nxt = 0;
  2817 + else
  2818 + tp->rcv_tstamp = tcp_time_stamp;
2817 2819 tp->rcv_wup = tp->rcv_nxt;
2818 2820 tp->copied_seq = tp->rcv_nxt;
2819 2821