diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-11 17:57:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-14 07:06:14 +0100 |
| commit | 5426a4ef6455c93e76a553eda0a1811bb0bbd214 (patch) | |
| tree | 4c134ca840c0fe984e9f5388281850f84513fa60 | |
| parent | 40f56d0c7043d16e9d49d1df6c02804c09ed5cd6 (diff) | |
| download | nf-next-5426a4ef6455c93e76a553eda0a1811bb0bbd214.tar.gz | |
mptcp: avoid additional indirection in mptcp_poll()
We are going to remove the first subflow socket soon, so avoid
the additional indirection at poll() time. Instead access
directly the first subflow sock.
No functional changes 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>
| -rw-r--r-- | net/mptcp/protocol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d8b75fbc4f248b..e89d1bf44f77bb 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3844,12 +3844,12 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock, state = inet_sk_state_load(sk); pr_debug("msk=%p state=%d flags=%lx", msk, state, msk->flags); if (state == TCP_LISTEN) { - struct socket *ssock = READ_ONCE(msk->subflow); + struct sock *ssk = READ_ONCE(msk->first); - if (WARN_ON_ONCE(!ssock || !ssock->sk)) + if (WARN_ON_ONCE(!ssk)) return 0; - return inet_csk_listen_poll(ssock->sk); + return inet_csk_listen_poll(ssk); } shutdown = READ_ONCE(sk->sk_shutdown); |