diff options
author | Yuchung Cheng <ycheng@google.com> | 2018-05-16 19:40:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-05-17 15:41:29 -0400 |
commit | b8fef65a8a76c2f887c56bf8e9684ff04e8d3b9f (patch) | |
tree | c6126e6ae98c561fa0d1a77593c367d779737771 /net/ipv4/tcp_input.c | |
parent | c77d62ffae377de331a19020c0b598a6faceb0ef (diff) |
tcp: new helper tcp_rack_skb_timeout
Create and export a new helper tcp_rack_skb_timeout and move tcp_is_rack
to prepare the final RTO change.
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Priyaranjan Jha <priyarjha@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1ccc97b368c7..ba8a8e3464aa 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1917,6 +1917,11 @@ static inline void tcp_init_undo(struct tcp_sock *tp) | |||
1917 | tp->undo_retrans = tp->retrans_out ? : -1; | 1917 | tp->undo_retrans = tp->retrans_out ? : -1; |
1918 | } | 1918 | } |
1919 | 1919 | ||
1920 | static bool tcp_is_rack(const struct sock *sk) | ||
1921 | { | ||
1922 | return sock_net(sk)->ipv4.sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION; | ||
1923 | } | ||
1924 | |||
1920 | /* If we detect SACK reneging, forget all SACK information | 1925 | /* If we detect SACK reneging, forget all SACK information |
1921 | * and reset tags completely, otherwise preserve SACKs. If receiver | 1926 | * and reset tags completely, otherwise preserve SACKs. If receiver |
1922 | * dropped its ofo queue, we will know this due to reneging detection. | 1927 | * dropped its ofo queue, we will know this due to reneging detection. |
@@ -2031,11 +2036,6 @@ static inline int tcp_dupack_heuristics(const struct tcp_sock *tp) | |||
2031 | return tp->sacked_out + 1; | 2036 | return tp->sacked_out + 1; |
2032 | } | 2037 | } |
2033 | 2038 | ||
2034 | static bool tcp_is_rack(const struct sock *sk) | ||
2035 | { | ||
2036 | return sock_net(sk)->ipv4.sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION; | ||
2037 | } | ||
2038 | |||
2039 | /* Linux NewReno/SACK/ECN state machine. | 2039 | /* Linux NewReno/SACK/ECN state machine. |
2040 | * -------------------------------------- | 2040 | * -------------------------------------- |
2041 | * | 2041 | * |