summaryrefslogtreecommitdiff
path: root/net/unix/unix_bpf.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-10 07:30:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-10 07:30:34 -0400
commitb0d369dbad20a8c9702607e7294d63c4a0c8e0fe (patch)
treeeb9bca1fb71a69ffe8f15f701ea8524b34ddaf07 /net/unix/unix_bpf.c
parentf8ace04d2abae708595964244a759fbe21962014 (diff)
parentfc85704c3dae5ac1cb3c94045727241cd72871ff (diff)
Merge v6.15.2
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/unix/unix_bpf.c')
-rw-r--r--net/unix/unix_bpf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/unix/unix_bpf.c b/net/unix/unix_bpf.c
index bca2d86ba97d8..e0d30d6d22acb 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) || \