From: David S. Miller <davem@sunset.sfo1.dsl.speakeasy.net>
Date: Thu, 25 May 2006 23:11:14 +0000 (-0700)
Subject: [TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous
X-Git-Tag: v2.6.18-rc1~1111^2~88
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=15986e1aadbbf40a331cddd0470bb434d156431d;p=linux-2.6-omap-h63xx.git

[TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous

We only want to take receive RTT mesaurements for data
bearing frames, here in the header prediction fast path
for a pure-sender, we know that we have a pure-ACK and
thus the checks in tcp_rcv_rtt_mesaure_ts() will not pass.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c6d62f0a996..6d167889a4b 100644
--- a/net/ipv4/tcp_input.c
+++ b/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.
 				 */