Skip to content

Commit e704939

Browse files
q2venkuba-moo
authored andcommitted
dccp/tcp: Remove an unused argument in inet_csk_listen_start().
The commit 1295e2c ("inet: minor optimization for backlog setting in listen(2)") added change so that sk_max_ack_backlog is initialised earlier in inet_dccp_listen() and inet_listen(). Since then, we no longer use backlog in inet_csk_listen_start(), so let's remove it. Signed-off-by: Kuniyuki Iwashima <[email protected]> Acked-by: Yafang Shao <[email protected]> Reviewed-by: Richard Sailer <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent c6d5f19 commit e704939

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

include/net/inet_connection_sock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ static inline __poll_t inet_csk_listen_poll(const struct sock *sk)
304304
(EPOLLIN | EPOLLRDNORM) : 0;
305305
}
306306

307-
int inet_csk_listen_start(struct sock *sk, int backlog);
307+
int inet_csk_listen_start(struct sock *sk);
308308
void inet_csk_listen_stop(struct sock *sk);
309309

310310
void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);

net/dccp/proto.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,15 @@ void dccp_destroy_sock(struct sock *sk)
238238

239239
EXPORT_SYMBOL_GPL(dccp_destroy_sock);
240240

241-
static inline int dccp_listen_start(struct sock *sk, int backlog)
241+
static inline int dccp_listen_start(struct sock *sk)
242242
{
243243
struct dccp_sock *dp = dccp_sk(sk);
244244

245245
dp->dccps_role = DCCP_ROLE_LISTEN;
246246
/* do not start to listen if feature negotiation setup fails */
247247
if (dccp_feat_finalise_settings(dp))
248248
return -EPROTO;
249-
return inet_csk_listen_start(sk, backlog);
249+
return inet_csk_listen_start(sk);
250250
}
251251

252252
static inline int dccp_need_reset(int state)
@@ -935,7 +935,7 @@ int inet_dccp_listen(struct socket *sock, int backlog)
935935
* FIXME: here it probably should be sk->sk_prot->listen_start
936936
* see tcp_listen_start
937937
*/
938-
err = dccp_listen_start(sk, backlog);
938+
err = dccp_listen_start(sk);
939939
if (err)
940940
goto out;
941941
}

net/ipv4/af_inet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ int inet_listen(struct socket *sock, int backlog)
225225
tcp_fastopen_init_key_once(sock_net(sk));
226226
}
227227

228-
err = inet_csk_listen_start(sk, backlog);
228+
err = inet_csk_listen_start(sk);
229229
if (err)
230230
goto out;
231231
tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL);

net/ipv4/inet_connection_sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ void inet_csk_prepare_forced_close(struct sock *sk)
10351035
}
10361036
EXPORT_SYMBOL(inet_csk_prepare_forced_close);
10371037

1038-
int inet_csk_listen_start(struct sock *sk, int backlog)
1038+
int inet_csk_listen_start(struct sock *sk)
10391039
{
10401040
struct inet_connection_sock *icsk = inet_csk(sk);
10411041
struct inet_sock *inet = inet_sk(sk);

tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static void set_task_info(struct sock *sk)
6868
}
6969

7070
SEC("fentry/inet_csk_listen_start")
71-
int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk, int backlog)
71+
int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk)
7272
{
7373
set_task_info(sk);
7474

0 commit comments

Comments
 (0)