diff options
| author | Neal Cardwell <ncardwell@google.com> | 2013-03-04 06:23:05 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 12:58:54 -0700 |
| commit | b1a7a7672b91264a9ff65be7d39f395522942efc (patch) | |
| tree | ae4e131ba52e15dfde396f29f7bde8eb1deb88dd /net/ipv4 | |
| parent | e7a432a0c3f5bd368535e529ce66f27b834c0e9c (diff) | |
| download | kernel_samsung_smdk4412-b1a7a7672b91264a9ff65be7d39f395522942efc.zip kernel_samsung_smdk4412-b1a7a7672b91264a9ff65be7d39f395522942efc.tar.gz kernel_samsung_smdk4412-b1a7a7672b91264a9ff65be7d39f395522942efc.tar.bz2 | |
tcp: fix double-counted receiver RTT when leaving receiver fast path
[ Upstream commit aab2b4bf224ef8358d262f95b568b8ad0cecf0a0 ]
We should not update ts_recent and call tcp_rcv_rtt_measure_ts() both
before and after going to step5. That wastes CPU and double-counts the
receiver-side RTT sample.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7f4e391..8a56d24 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5419,6 +5419,9 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, if (tcp_checksum_complete_user(sk, skb)) goto csum_error; + if ((int)skb->truesize > sk->sk_forward_alloc) + goto step5; + /* Predicted packet is in window by definition. * seq == rcv_nxt and rcv_wup <= rcv_nxt. * Hence, check seq<=rcv_wup reduces to: @@ -5430,9 +5433,6 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, tcp_rcv_rtt_measure_ts(sk, skb); - if ((int)skb->truesize > sk->sk_forward_alloc) - goto step5; - NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPHPHITS); /* Bulk data transfer: receiver */ |