Skip to content

Commit 5cdc744

Browse files
nealcardwellAlexei Starovoitov
authored andcommitted
tcp: simplify _bpf_setsockopt(): Remove flags argument
Now that the previous patches have removed the code that uses the flags argument to _bpf_setsockopt(), we can remove that argument. Signed-off-by: Neal Cardwell <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Acked-by: Yuchung Cheng <[email protected]> Acked-by: Kevin Yang <[email protected]> Cc: Lawrence Brakmo <[email protected]>
1 parent 29a9493 commit 5cdc744

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

net/core/filter.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4314,7 +4314,7 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = {
43144314
};
43154315

43164316
static int _bpf_setsockopt(struct sock *sk, int level, int optname,
4317-
char *optval, int optlen, u32 flags)
4317+
char *optval, int optlen)
43184318
{
43194319
char devname[IFNAMSIZ];
43204320
int val, valbool;
@@ -4611,9 +4611,7 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
46114611
BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx,
46124612
int, level, int, optname, char *, optval, int, optlen)
46134613
{
4614-
u32 flags = 0;
4615-
return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen,
4616-
flags);
4614+
return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen);
46174615
}
46184616

46194617
static const struct bpf_func_proto bpf_sock_addr_setsockopt_proto = {
@@ -4647,9 +4645,7 @@ static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = {
46474645
BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
46484646
int, level, int, optname, char *, optval, int, optlen)
46494647
{
4650-
u32 flags = 0;
4651-
return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen,
4652-
flags);
4648+
return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen);
46534649
}
46544650

46554651
static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = {

0 commit comments

Comments
 (0)