aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r--net/ipv4/tcp_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 27a667bce806..c4a35ba7f8ed 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -341,7 +341,8 @@ static void tcp_probe_timer(struct sock *sk)
341 if (!start_ts) 341 if (!start_ts)
342 tcp_send_head(sk)->skb_mstamp = tp->tcp_mstamp; 342 tcp_send_head(sk)->skb_mstamp = tp->tcp_mstamp;
343 else if (icsk->icsk_user_timeout && 343 else if (icsk->icsk_user_timeout &&
344 (s32)(tcp_time_stamp(tp) - start_ts) > icsk->icsk_user_timeout) 344 (s32)(tcp_time_stamp(tp) - start_ts) >
345 jiffies_to_msecs(icsk->icsk_user_timeout))
345 goto abort; 346 goto abort;
346 347
347 max_probes = sock_net(sk)->ipv4.sysctl_tcp_retries2; 348 max_probes = sock_net(sk)->ipv4.sysctl_tcp_retries2;