mptcp: remove inner wait loop from mptcp_sendmsg_frag (5c826443) · Commits · 戴 / test

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:

net/mptcp/protocol.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -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;