---

yaml --- r: 299949 b: refs/heads/master c: 651913c h: refs/heads/master i: 299947: 23ec579 v: v3
git-mirror · Apr 27, 2012 · 10dca65 · 10dca65
1 parent cc901ab
commit 10dca65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b6efb75e9467f7c2df279cbd657f741ec3493cf
+refs/heads/master: 651913ce9de2bbcedef608c5d6cf39c244248509
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -495,7 +495,7 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp)
 		goto new_measure;
 	if (before(tp->rcv_nxt, tp->rcv_rtt_est.seq))
 		return;
-	tcp_rcv_rtt_update(tp, jiffies - tp->rcv_rtt_est.time, 1);
+	tcp_rcv_rtt_update(tp, tcp_time_stamp - tp->rcv_rtt_est.time, 1);
 
 new_measure:
 	tp->rcv_rtt_est.seq = tp->rcv_nxt + tp->rcv_wnd;