---

yaml --- r: 328060 b: refs/heads/master c: 30099b2 h: refs/heads/master v: v3
git-mirror · Sep 23, 2012 · 1a89feb · 1a89feb
1 parent 647898d
commit 1a89feb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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