---

yaml --- r: 27507 b: refs/heads/master c: 15986e1 h: refs/heads/master i: 27505: 7c9320e 27503: 68167ed v: v3
git-mirror · Jun 18, 2006 · 9b8a905 · 9b8a905
1 parent dd80132
commit 9b8a905
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11dc1f36a6701b502ecb695f308aae46ede8bac6
+refs/heads/master: 15986e1aadbbf40a331cddd0470bb434d156431d
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -3931,8 +3931,6 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 				    tp->rcv_nxt == tp->rcv_wup)
 					tcp_store_ts_recent(tp);
 
-				tcp_rcv_rtt_measure_ts(sk, skb);
-
 				/* We know that such packets are checksummed
 				 * on entry.
 				 */