diff options
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index a339e7ba05a4..b24360f6e293 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -180,7 +180,7 @@ static int tcp_write_timeout(struct sock *sk) | |||
180 | 180 | ||
181 | retry_until = sysctl_tcp_retries2; | 181 | retry_until = sysctl_tcp_retries2; |
182 | if (sock_flag(sk, SOCK_DEAD)) { | 182 | if (sock_flag(sk, SOCK_DEAD)) { |
183 | const int alive = (icsk->icsk_rto < TCP_RTO_MAX); | 183 | const int alive = icsk->icsk_rto < TCP_RTO_MAX; |
184 | 184 | ||
185 | retry_until = tcp_orphan_retries(sk, alive); | 185 | retry_until = tcp_orphan_retries(sk, alive); |
186 | do_reset = alive || | 186 | do_reset = alive || |
@@ -294,7 +294,7 @@ static void tcp_probe_timer(struct sock *sk) | |||
294 | max_probes = sysctl_tcp_retries2; | 294 | max_probes = sysctl_tcp_retries2; |
295 | 295 | ||
296 | if (sock_flag(sk, SOCK_DEAD)) { | 296 | if (sock_flag(sk, SOCK_DEAD)) { |
297 | const int alive = ((icsk->icsk_rto << icsk->icsk_backoff) < TCP_RTO_MAX); | 297 | const int alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) < TCP_RTO_MAX; |
298 | 298 | ||
299 | max_probes = tcp_orphan_retries(sk, alive); | 299 | max_probes = tcp_orphan_retries(sk, alive); |
300 | 300 | ||