1 files changed, 6 insertions, 2 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 4787f86ae64c..b945c2b046c5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1136,11 +1136,12 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         /* This should be in poll */
         sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
 
-        mss_now = tcp_send_mss(sk, &size_goal, flags);
-
         /* Ok commence sending. */
         copied = 0;
 
+restart:
+        mss_now = tcp_send_mss(sk, &size_goal, flags);
+
         err = -EPIPE;
         if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
                 goto out_err;
@@ -1166,6 +1167,9 @@ new_segment:
                         if (!sk_stream_memory_free(sk))
                                 goto wait_for_sndbuf;
 
+                        if (sk_flush_backlog(sk))
+                                goto restart;
+
                         skb = sk_stream_alloc_skb(sk,
                                                   select_size(sk, sg),
                                                   sk->sk_allocation,