summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2026-04-16 22:03:22 +0300
committerJiri Kosina <jkosina@suse.com>2026-04-16 22:03:22 +0300
commit500af712f9cb61e9e3d32760df0cc5dd4f3046aa (patch)
tree322896c1bd69147916efd648b07b30798ef9beb1 /include/uapi
parentd4eb7b2da66c848709e31585b9c371fa234abc39 (diff)
parent42d020b54edc57d03749bed75976f1e962a9fbfa (diff)
downloadlinux-500af712f9cb61e9e3d32760df0cc5dd4f3046aa.tar.xz
Merge branch 'for-7.1/winwing' into for-linus
- support for rubmle effects in winwing driver (Ivan Gorinov)
Diffstat (limited to 'include/uapi')
-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 */