leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: simplify _bpf_setsockopt(): Remove flags argument

Browse Source 
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 <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Kevin Yang <yyd@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
This commit is contained in:
Neal Cardwell
2020-09-10 15:35:35 -04:00
committed by Alexei Starovoitov
parent 29a949325c
commit 5cdc744caa
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/core/filter.c
View File

@@ -4314,7 +4314,7 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = {
}; };
static int _bpf_setsockopt(struct sock *sk, int level, int optname, static int _bpf_setsockopt(struct sock *sk, int level, int optname,
char *optval, int optlen, u32 flags) char *optval, int optlen)
{ {
char devname[IFNAMSIZ]; char devname[IFNAMSIZ];
int val, valbool; int val, valbool;
@@ -4611,9 +4611,7 @@ err_clear:
BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx, BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx,
int, level, int, optname, char *, optval, int, optlen) int, level, int, optname, char *, optval, int, optlen)
{ {
u32 flags = 0; return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen);
return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen,
flags);
} }
static const struct bpf_func_proto bpf_sock_addr_setsockopt_proto = { 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 = {
BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
int, level, int, optname, char *, optval, int, optlen) int, level, int, optname, char *, optval, int, optlen)
{ {
u32 flags = 0; return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen);
return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen,
flags);
} }
static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = { static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = {