summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorNeal Cardwell <ncardwell@google.com>2012-09-22 04:18:54 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-22 15:47:10 -0400
commit623df484a777f3c00c1ea3d6a7565b8d8ac688a1 (patch)
tree6394f6b3bac15a274dbaecc4c5d46761f838f2ca /net/ipv6
parentde46584675fad02b7f8255f31be0ea1be5cd185b (diff)
downloadlinux-3.10-623df484a777f3c00c1ea3d6a7565b8d8ac688a1.tar.gz
linux-3.10-623df484a777f3c00c1ea3d6a7565b8d8ac688a1.tar.bz2
linux-3.10-623df484a777f3c00c1ea3d6a7565b8d8ac688a1.zip
tcp: extract code to compute SYNACK RTT
In preparation for adding another spot where we compute the SYNACK RTT, extract this code so that it can be shared. Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index f3bfb8bbfde..cfeeeb7fcf5 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1348,9 +1348,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
newtp->advmss = tcp_sk(sk)->rx_opt.user_mss;
tcp_initialize_rcv_mss(newsk);
- if (tcp_rsk(req)->snt_synack)
- tcp_valid_rtt_meas(newsk,
- tcp_time_stamp - tcp_rsk(req)->snt_synack);
+ tcp_synack_rtt_meas(newsk, req);
newtp->total_retrans = req->retrans;
newinet->inet_daddr = newinet->inet_saddr = LOOPBACK4_IPV6;