Commit 5cdc744c authored by Neal Cardwell's avatar Neal Cardwell Committed by Alexei Starovoitov
Browse files

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: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarKevin Yang <yyd@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
parent 29a94932

net/core/filter.c

+3 −7
Original line number Diff line number Diff line
@@ -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,

			   char *optval, int optlen, u32 flags)

			   char *optval, int optlen)

{

	char devname[IFNAMSIZ];

	int val, valbool;
@@ -4611,9 +4611,7 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname, 
BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx,

	   int, level, int, optname, char *, optval, int, optlen)

{

	u32 flags = 0;

	return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen,

			       flags);

	return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen);

}



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,

	   int, level, int, optname, char *, optval, int, optlen)

{

	u32 flags = 0;

	return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen,

			       flags);

	return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen);

}



static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = {