Commit 69d93dae authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: refine memory scheduling 



Similar to commit 7c80b038 ("net: fix sk_wmem_schedule() and
sk_rmem_schedule() errors"), let the MPTCP receive path schedule
exactly the required amount of memory.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d24141fe

net/mptcp/protocol.c

+2 −1
Original line number Diff line number Diff line
@@ -323,9 +323,10 @@ static bool mptcp_rmem_schedule(struct sock *sk, struct sock *ssk, int size) 
	struct mptcp_sock *msk = mptcp_sk(sk);

	int amt, amount;



	if (size < msk->rmem_fwd_alloc)

	if (size <= msk->rmem_fwd_alloc)

		return true;



	size -= msk->rmem_fwd_alloc;

	amt = sk_mem_pages(size);

	amount = amt << PAGE_SHIFT;

	if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV))