Merge remote branch 'wireless-next/master' into ath6kl-next

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp_timer.c

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 34d4a02c2f16d867cb95827ee5ebc2256d0745b3..e911e6c523eca58101f1bc044428b0b7a119e5ca 100644 (file)
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -319,6 +319,11 @@ void tcp_retransmit_timer(struct sock *sk)
        struct tcp_sock *tp = tcp_sk(sk);
        struct inet_connection_sock *icsk = inet_csk(sk);
 
+       if (tp->early_retrans_delayed) {
+               tcp_resume_early_retransmit(sk);
+               return;
+       }
+
        if (!tp->packets_out)
                goto out;