Commit 3c90e377 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: don't clear MPTCP_DATA_READY in sk_wait_event() 



If we don't flush entirely the receive queue, we need set
again such bit later. We can simply avoid clearing it.

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 75e908c3

net/mptcp/protocol.c

+2 −4
Original line number Diff line number Diff line
@@ -1715,7 +1715,7 @@ static void mptcp_wait_data(struct sock *sk, long *timeo) 
	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);



	sk_wait_event(sk, timeo,

		      test_and_clear_bit(MPTCP_DATA_READY, &msk->flags), &wait);

		      test_bit(MPTCP_DATA_READY, &msk->flags), &wait);



	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);

	remove_wait_queue(sk_sleep(sk), &wait);
@@ -2039,10 +2039,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
		 */

		if (unlikely(__mptcp_move_skbs(msk)))

			set_bit(MPTCP_DATA_READY, &msk->flags);

	} else if (unlikely(!test_bit(MPTCP_DATA_READY, &msk->flags))) {

		/* data to read but mptcp_wait_data() cleared DATA_READY */

		set_bit(MPTCP_DATA_READY, &msk->flags);

	}



out_err:

	if (cmsg_flags && copied >= 0) {

		if (cmsg_flags & MPTCP_CMSG_TS)