diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-11 17:57:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-14 08:06:14 +0200 |
| commit | 3f326a821b99812edb6d3c24bcb78377cae6e432 (patch) | |
| tree | f131a977699c42f29f12f0b314e8a73ec9137989 /net/mptcp/protocol.h | |
| parent | mptcp: avoid ssock usage in mptcp_pm_nl_create_listen_socket() (diff) | |
| download | linux-3f326a821b99812edb6d3c24bcb78377cae6e432.tar.xz linux-3f326a821b99812edb6d3c24bcb78377cae6e432.zip | |
mptcp: change the mpc check helper to return a sk
After the previous patch the __mptcp_nmpc_socket helper is used
only to ensure that the MPTCP socket is a suitable status - that
is, the mptcp capable handshake is not started yet.
Change the return value to the relevant subflow sock, to finally
remove the last references to first subflow socket in the MPTCP stack.
As a bonus, we can get rid of a few local variables in different
functions.
No functional change intended.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 79fc5cdb67bc..dccc96dc2d6b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -640,7 +640,7 @@ void __mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); -struct socket *__mptcp_nmpc_socket(struct mptcp_sock *msk); +struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); void __mptcp_unaccepted_force_close(struct sock *sk); |