mptcp: remove inner wait loop from mptcp_sendmsg_frag

previous patches made sure we only call into this function
when these prerequisites are met, so no need to wait on the
subflow socket anymore.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/7
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index a11e51222e59f8b5b72a16a1b0ddef7c4296cd33..bc950cf818f79a51bbca598498cd57a25acf7931 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -510,20 +510,6 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
         * fooled into a warning if we don't init here
         */
        pfrag = sk_page_frag(sk);
-       while ((!retransmission && !mptcp_page_frag_refill(ssk, pfrag)) ||
-              !mptcp_ext_cache_refill(msk)) {
-               ret = sk_stream_wait_memory(ssk, timeo);
-               if (ret)
-                       return ret;
-
-               /* if sk_stream_wait_memory() sleeps snd_una can change
-                * significantly, refresh the rtx queue
-                */
-               mptcp_clean_una(sk);
-
-               if (unlikely(__mptcp_needs_tcp_fallback(msk)))
-                       return 0;
-       }
        if (!retransmission) {
                write_seq = &msk->write_seq;
                page = pfrag->page;