summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2026-04-16 08:40:47 +0300
committerNamhyung Kim <namhyung@kernel.org>2026-04-16 08:44:00 +0300
commit9a683fe0a00d2684ae874fd9eb58e6c1864fdf36 (patch)
tree90d434afc722307a59cc9b1b7d20df5ecf9199af /include/uapi/linux
parent841dbf4871c57ce2da18c4ea7ffac5487d0eda16 (diff)
parent7aaa8047eafd0bd628065b15757d9b48c5f9c07d (diff)
downloadlinux-9a683fe0a00d2684ae874fd9eb58e6c1864fdf36.tar.xz
Merge tag 'v7.0-rc6' into perf-tools
To get the latest updates and fixes. Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/netfilter/nf_conntrack_common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h
index 26071021e986..56b6b60a814f 100644
--- a/include/uapi/linux/netfilter/nf_conntrack_common.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_common.h
@@ -159,5 +159,9 @@ enum ip_conntrack_expect_events {
#define NF_CT_EXPECT_INACTIVE 0x2
#define NF_CT_EXPECT_USERSPACE 0x4
+#ifdef __KERNEL__
+#define NF_CT_EXPECT_MASK (NF_CT_EXPECT_PERMANENT | NF_CT_EXPECT_INACTIVE | \
+ NF_CT_EXPECT_USERSPACE)
+#endif
#endif /* _UAPI_NF_CONNTRACK_COMMON_H */