[PATCH v2 mptcp-next 01/13] mptcp: avoid unneeded mptcp_token_destroy() calls

Paolo Abeni posted 13 patches 1 year, 3 months ago
Maintainers: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, David Ahern <dsahern@kernel.org>, Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <martineau@kernel.org>
[PATCH v2 mptcp-next 01/13] mptcp: avoid unneeded mptcp_token_destroy() calls
Posted by Paolo Abeni 1 year, 3 months ago
The mptcp protocol currently clears the msk token both at
connect() and listen() time. That was necessary before the
mptcp protocol gained a full disconnect implementation, but
after commit b29fcfb54cd7 ("mptcp: full disconnect implementation")
such calls are no more necessary and a bit confusing.

Just drop them.

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

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 8b5c78f582f7..17174bdae1ca 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3634,7 +3634,6 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 	if (IS_ERR(ssock))
 		return PTR_ERR(ssock);
 
-	mptcp_token_destroy(msk);
 	inet_sk_state_store(sk, TCP_SYN_SENT);
 	subflow = mptcp_subflow_ctx(ssock->sk);
 #ifdef CONFIG_TCP_MD5SIG
@@ -3753,7 +3752,6 @@ static int mptcp_listen(struct socket *sock, int backlog)
 		goto unlock;
 	}
 
-	mptcp_token_destroy(msk);
 	inet_sk_state_store(sk, TCP_LISTEN);
 	sock_set_flag(sk, SOCK_RCU_FREE);
 
-- 
2.41.0