From 1a89febf2ea1321ac863b0ac3499940c45e05cff Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Sat, 22 Sep 2012 17:03:47 +0000
Subject: [PATCH] --- yaml --- r: 328060 b: refs/heads/master c:
 30099b2e9b3a1f88250d31472edf2b6d6f0a7d8b h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 42b8d728b2b4..5772dbb2cbc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5894bab7f452d61941a6d3215dec43221ac0be4b
+refs/heads/master: 30099b2e9b3a1f88250d31472edf2b6d6f0a7d8b
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 36e069a1f47b..e037697c3b77 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -5985,6 +5985,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 				 */
 				if (req) {
 					tcp_synack_rtt_meas(sk, req);
+					tp->total_retrans = req->retrans;
+
 					reqsk_fastopen_remove(sk, req, false);
 				} else {
 					/* Make sure socket is routed, for