diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-03-31 00:47:05 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-03-31 00:51:02 +0300 |
| commit | f6225b546dfccfc322b18c0d757b7b9c767a1e27 (patch) | |
| tree | 14aee2a223e3f5e3e7850e6674d8367b4c835235 /include/uapi | |
| parent | a51973c5dff8a0f01cc7d1b2007306ea0004fa16 (diff) | |
| parent | 7aaa8047eafd0bd628065b15757d9b48c5f9c07d (diff) | |
| download | linux-f6225b546dfccfc322b18c0d757b7b9c767a1e27.tar.xz | |
BackMerge tag 'v7.0-rc6' into drm-next
Linux 7.0-rc6
Requested by a few people on irc to resolve conflicts in other tress.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_common.h | 4 |
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 */ |