Message ID | 20200602195147.56912-1-zeil@yandex-team.ru |
---|---|
State | Awaiting Upstream |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf-next,v4,1/3] sock: move sock_valbool_flag to header | expand |
On 6/2/20 9:51 PM, Dmitry Yakunin wrote: > This is preparation for usage in bpf_setsockopt. > > Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru> > Acked-by: Martin KaFai Lau <kafai@fb.com> bpf-next is currently closed due to merge window. Please resend once bpf-next opens back up in ~2 weeks from now. Feel free to check the status here [0]. Thanks, Daniel [0] http://vger.kernel.org/~davem/net-next.html
diff --git a/include/net/sock.h b/include/net/sock.h index c53cc42..8ba438b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -879,6 +879,15 @@ static inline void sock_reset_flag(struct sock *sk, enum sock_flags flag) __clear_bit(flag, &sk->sk_flags); } +static inline void sock_valbool_flag(struct sock *sk, enum sock_flags bit, + int valbool) +{ + if (valbool) + sock_set_flag(sk, bit); + else + sock_reset_flag(sk, bit); +} + static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) { return test_bit(flag, &sk->sk_flags); diff --git a/net/core/sock.c b/net/core/sock.c index 6c4acf1..5ba4753 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -695,15 +695,6 @@ static int sock_getbindtodevice(struct sock *sk, char __user *optval, return ret; } -static inline void sock_valbool_flag(struct sock *sk, enum sock_flags bit, - int valbool) -{ - if (valbool) - sock_set_flag(sk, bit); - else - sock_reset_flag(sk, bit); -} - bool sk_mc_loop(struct sock *sk) { if (dev_recursion_level())