1 files changed, 11 insertions, 15 deletions

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index c4a35ba7f8ed..c0feeeef962a 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -139,21 +139,17 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
  *  @timeout:  A custom timeout value.
  *             If set to 0 the default timeout is calculated and used.
  *             Using TCP_RTO_MIN and the number of unsuccessful retransmits.
- *  @syn_set:  true if the SYN Bit was set.
  *
  * The default "timeout" value this function can calculate and use
  * is equivalent to the timeout of a TCP Connection
  * after "boundary" unsuccessful, exponentially backed-off
- * retransmissions with an initial RTO of TCP_RTO_MIN or TCP_TIMEOUT_INIT if
- * syn_set flag is set.
- *
+ * retransmissions with an initial RTO of TCP_RTO_MIN.
  */
 static bool retransmits_timed_out(struct sock *sk,
                                   unsigned int boundary,
-                                  unsigned int timeout,
-                                  bool syn_set)
+                                  unsigned int timeout)
 {
-        unsigned int rto_base = syn_set ? TCP_TIMEOUT_INIT : TCP_RTO_MIN;
+        const unsigned int rto_base = TCP_RTO_MIN;
         unsigned int linear_backoff_thresh, start_ts;
 
         if (!inet_csk(sk)->icsk_retransmits)
@@ -181,8 +177,8 @@ static int tcp_write_timeout(struct sock *sk)
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
         struct net *net = sock_net(sk);
+        bool expired, do_reset;
         int retry_until;
-        bool do_reset, syn_set = false;
 
         if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
                 if (icsk->icsk_retransmits) {
@@ -196,9 +192,9 @@ static int tcp_write_timeout(struct sock *sk)
                         sk_rethink_txhash(sk);
                 }
                 retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;
-                syn_set = true;
+                expired = icsk->icsk_retransmits >= retry_until;
         } else {
-                if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1, 0, 0)) {
+                if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1, 0)) {
                         /* Some middle-boxes may black-hole Fast Open _after_
                          * the handshake. Therefore we conservatively disable
                          * Fast Open on this path on recurring timeouts after
@@ -224,15 +220,15 @@ static int tcp_write_timeout(struct sock *sk)
 
                         retry_until = tcp_orphan_retries(sk, alive);
                         do_reset = alive ||
-                                !retransmits_timed_out(sk, retry_until, 0, 0);
+                                !retransmits_timed_out(sk, retry_until, 0);
 
                         if (tcp_out_of_resources(sk, do_reset))
                                 return 1;
                 }
+                expired = retransmits_timed_out(sk, retry_until,
+                                                icsk->icsk_user_timeout);
         }
-
-        if (retransmits_timed_out(sk, retry_until,
-                                  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
+        if (expired) {
                 /* Has it gone just too far? */
                 tcp_write_err(sk);
                 return 1;
@@ -540,7 +536,7 @@ out_reset_timer:
                 icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
         }
         inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
-        if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1 + 1, 0, 0))
+        if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1 + 1, 0))
                 __sk_dst_reset(sk);
 
 out:;