OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dccp: Inline dccp_listen_start(). 

This patch inlines dccp_listen_start() and removes a stale comment in
inet_dccp_listen() so that it looks like inet_listen().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Reviewed-by: Richard Sailer <richard_siegfried@systemli.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kuniyuki Iwashima 2021-11-22 19:16:22 +09:00 committed by Jakub Kicinski
parent e7049395b1
commit b4a8e7493d
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/dccp/proto.c
View File

@ -238,17 +238,6 @@ void dccp_destroy_sock(struct sock *sk)
EXPORT_SYMBOL_GPL(dccp_destroy_sock); EXPORT_SYMBOL_GPL(dccp_destroy_sock);
static inline int dccp_listen_start(struct sock *sk)
{
struct dccp_sock *dp = dccp_sk(sk);
dp->dccps_role = DCCP_ROLE_LISTEN;
/* do not start to listen if feature negotiation setup fails */
if (dccp_feat_finalise_settings(dp))
return -EPROTO;
return inet_csk_listen_start(sk);
}
static inline int dccp_need_reset(int state) static inline int dccp_need_reset(int state)
{ {
return state != DCCP_CLOSED && state != DCCP_LISTEN && return state != DCCP_CLOSED && state != DCCP_LISTEN &&
@ -931,11 +920,17 @@ int inet_dccp_listen(struct socket *sock, int backlog)
* we can only allow the backlog to be adjusted. * we can only allow the backlog to be adjusted.
*/ */
if (old_state != DCCP_LISTEN) { if (old_state != DCCP_LISTEN) {
/* struct dccp_sock *dp = dccp_sk(sk);
* FIXME: here it probably should be sk->sk_prot->listen_start
* see tcp_listen_start dp->dccps_role = DCCP_ROLE_LISTEN;
*/
err = dccp_listen_start(sk); /* do not start to listen if feature negotiation setup fails */
if (dccp_feat_finalise_settings(dp)) {
err = -EPROTO;
goto out;
}
err = inet_csk_listen_start(sk);
if (err) if (err)
goto out; goto out;
} }