diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 |
| commit | 4f9786035f9e519db41375818e1d0b5f20da2f10 (patch) | |
| tree | b307ecc9ab55c44ace462e59549c6d7976da5bfd /net/unix/unix_bpf.c | |
| parent | ca39500f6af9cfe6823dc5aa8fbaed788d6e35b2 (diff) | |
| parent | a95ef0199e80f3384eb992889322957d26c00102 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.16 merge window.
Diffstat (limited to 'net/unix/unix_bpf.c')
| -rw-r--r-- | net/unix/unix_bpf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/unix/unix_bpf.c b/net/unix/unix_bpf.c index bca2d86ba97d..e0d30d6d22ac 100644 --- a/net/unix/unix_bpf.c +++ b/net/unix/unix_bpf.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2021 Cong Wang <cong.wang@bytedance.com> */ -#include <linux/skmsg.h> #include <linux/bpf.h> -#include <net/sock.h> +#include <linux/skmsg.h> #include <net/af_unix.h> +#include "af_unix.h" + #define unix_sk_has_data(__sk, __psock) \ ({ !skb_queue_empty(&__sk->sk_receive_queue) || \ !skb_queue_empty(&__psock->ingress_skb) || \ |