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: #7 Signed-off-by: Florian Westphal <[email protected]>
multipath-tcp · May 12, 2020 · 4e9a291 · 4e9a291
1 parent a59d0ea
commit 4e9a291
Showing 1 changed file with 0 additions and 14 deletions.
diff --git 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;