1 files changed, 3 insertions, 20 deletions

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index e7d09e3705b8..1e61f0bd6e24 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -22,28 +22,14 @@
 #include <linux/gfp.h>
 #include <net/tcp.h>
 
-static u32 tcp_retransmit_stamp(const struct sock *sk)
-{
-        u32 start_ts = tcp_sk(sk)->retrans_stamp;
-
-        if (unlikely(!start_ts)) {
-                struct sk_buff *head = tcp_rtx_queue_head(sk);
-
-                if (!head)
-                        return 0;
-                start_ts = tcp_skb_timestamp(head);
-        }
-        return start_ts;
-}
-
 static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk)
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
         u32 elapsed, start_ts;
         s32 remaining;
 
-        start_ts = tcp_retransmit_stamp(sk);
-        if (!icsk->icsk_user_timeout || !start_ts)
+        start_ts = tcp_sk(sk)->retrans_stamp;
+        if (!icsk->icsk_user_timeout)
                 return icsk->icsk_rto;
         elapsed = tcp_time_stamp(tcp_sk(sk)) - start_ts;
         remaining = icsk->icsk_user_timeout - elapsed;
@@ -197,10 +183,7 @@ static bool retransmits_timed_out(struct sock *sk,
         if (!inet_csk(sk)->icsk_retransmits)
                 return false;
 
-        start_ts = tcp_retransmit_stamp(sk);
-        if (!start_ts)
-                return false;
-
+        start_ts = tcp_sk(sk)->retrans_stamp;
         if (likely(timeout == 0)) {
                 linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);