From 9b8a905c983d478184ee3102311c7f7f026d2563 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.sfo1.dsl.speakeasy.net>
Date: Thu, 25 May 2006 16:11:14 -0700
Subject: [PATCH] --- yaml --- r: 27507 b: refs/heads/master c:
 15986e1aadbbf40a331cddd0470bb434d156431d h: refs/heads/master i:   27505:
 7c9320e4fb20ea7b8bb5a0bfa697fedecc9315ff   27503:
 68167ed7c8f10680bd581effdde744e645b5e417 v: v3

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

diff --git a/[refs] b/[refs]
index 024546934f7b..67a99ba152df 100644
--- 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
index c6d62f0a9966..6d167889a4b0 100644
--- 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.
 				 */