diff options
| author | David S. Miller <davem@davemloft.net> | 2013-07-23 05:01:09 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-23 05:01:09 +0400 |
| commit | 20ff44aad10b82aa173c1de253dded5590a9d10b (patch) | |
| tree | ecbd6be76046918abb5a61941d0f845ea2c97b27 /include | |
| parent | c3f51d5f387b552b9d9fd7f41e19b84929712f82 (diff) | |
| parent | ed08495c31bb991de636d2488abaa50b39f2ff4a (diff) | |
| download | linux-20ff44aad10b82aa173c1de253dded5590a9d10b.tar.xz | |
Merge branch 'tcp'
Yuchung Cheng says:
====================
This patch series improve RTT sampling in three ways:
1. Sample RTT during fast recovery and reordering events.
2. Favor ack-based RTT to timestamps because of broken TS ECR fields
3. Consolidate the RTT measurement logic.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index d1980054ec75..c5868471abae 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -591,7 +591,6 @@ extern void tcp_initialize_rcv_mss(struct sock *sk); extern int tcp_mtu_to_mss(struct sock *sk, int pmtu); extern int tcp_mss_to_mtu(struct sock *sk, int mss); extern void tcp_mtup_init(struct sock *sk); -extern void tcp_valid_rtt_meas(struct sock *sk, u32 seq_rtt); extern void tcp_init_buffer_space(struct sock *sk); static inline void tcp_bound_rto(const struct sock *sk) @@ -1094,15 +1093,6 @@ static inline void tcp_openreq_init(struct request_sock *req, ireq->loc_port = tcp_hdr(skb)->dest; } -/* Compute time elapsed between SYNACK and the ACK completing 3WHS */ -static inline void tcp_synack_rtt_meas(struct sock *sk, - struct request_sock *req) -{ - if (tcp_rsk(req)->snt_synack) - tcp_valid_rtt_meas(sk, - tcp_time_stamp - tcp_rsk(req)->snt_synack); -} - extern void tcp_enter_memory_pressure(struct sock *sk); static inline int keepalive_intvl_when(const struct tcp_sock *tp) |