mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
net: factor out __inet_listen_sk() helper
The mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is inet_listen(). Factor out an helper operating directly on the (locked) struct sock, to allow get rid of the above dependency in the next patch without duplicating the existing code. No functional changes intended. Signed-off-by: Paolo Abeni <pabeni@redhat.com> Acked-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8cf2ebdc00
commit
71a9a874cd
|
@ -40,6 +40,7 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
|
|||
int flags);
|
||||
int inet_shutdown(struct socket *sock, int how);
|
||||
int inet_listen(struct socket *sock, int backlog);
|
||||
int __inet_listen_sk(struct sock *sk, int backlog);
|
||||
void inet_sock_destruct(struct sock *sk);
|
||||
int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
|
||||
int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
|
|
|
@ -187,24 +187,13 @@ static int inet_autobind(struct sock *sk)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Move a socket into listening state.
|
||||
*/
|
||||
int inet_listen(struct socket *sock, int backlog)
|
||||
int __inet_listen_sk(struct sock *sk, int backlog)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
unsigned char old_state;
|
||||
unsigned char old_state = sk->sk_state;
|
||||
int err, tcp_fastopen;
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
err = -EINVAL;
|
||||
if (sock->state != SS_UNCONNECTED || sock->type != SOCK_STREAM)
|
||||
goto out;
|
||||
|
||||
old_state = sk->sk_state;
|
||||
if (!((1 << old_state) & (TCPF_CLOSE | TCPF_LISTEN)))
|
||||
goto out;
|
||||
return -EINVAL;
|
||||
|
||||
WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
|
||||
/* Really, if the socket is already in listen state
|
||||
|
@ -227,10 +216,27 @@ int inet_listen(struct socket *sock, int backlog)
|
|||
|
||||
err = inet_csk_listen_start(sk);
|
||||
if (err)
|
||||
goto out;
|
||||
return err;
|
||||
|
||||
tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL);
|
||||
}
|
||||
err = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Move a socket into listening state.
|
||||
*/
|
||||
int inet_listen(struct socket *sock, int backlog)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
int err = -EINVAL;
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
if (sock->state != SS_UNCONNECTED || sock->type != SOCK_STREAM)
|
||||
goto out;
|
||||
|
||||
err = __inet_listen_sk(sk, backlog);
|
||||
|
||||
out:
|
||||
release_sock(sk);
|
||||
|
|
Loading…
Reference in a new issue