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: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index c47ce07..3e088e9 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -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)