From f1849467dcddd87cbc36528b5d35dbfe1ce11db0 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 8 May 2020 08:19:44 +0000 Subject: [PATCH] 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 Signed-off-by: Florian Westphal --- net/mptcp/protocol.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4c10c938d94a9..85ca7175c334d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -531,20 +531,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;