diff mbox series

[net-next] Squash-to: "mptcp: protect the rx path with the msk socket spinlock"

Message ID b1ff505e3dcff29eda4a2f3354c3a9d1223e4390.1605823023.git.pabeni@redhat.com
State Accepted, archived
Commit abdb87ebc91bfd3810ca6ebd9ad38c0b08d74dd0
Delegated to: Matthieu Baerts
Headers show
Series [net-next] Squash-to: "mptcp: protect the rx path with the msk socket spinlock" | expand

Commit Message

Paolo Abeni Nov. 19, 2020, 9:57 p.m. UTC
drop left-over splicing from the join list, we don't need
it anymore there.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/protocol.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Matthieu Baerts Nov. 20, 2020, 5:14 p.m. UTC | #1
Hi Paolo,

On 19/11/2020 22:57, Paolo Abeni wrote:
> drop left-over splicing from the join list, we don't need
> it anymore there.

Thank you for the fix!

- abdb87ebc91b: "squashed" in "mptcp: protect the rx path with the msk 
socket spinlock"
- Results: 3e5b456bf2e8..580a33433a07

Tests + export are in progress!

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index f55dc414c403..7c3508dae1c8 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1698,7 +1698,6 @@  static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 
 	len = min_t(size_t, len, INT_MAX);
 	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
-	__mptcp_flush_join_list(msk);
 
 	for (;;) {
 		int bytes_read, old_space;