diff options
| author | Mark Brown <broonie@kernel.org> | 2026-03-30 17:59:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-03-30 17:59:52 +0100 |
| commit | 2a740dc5892a0e90e32ddae4d0ece501ace2adfc (patch) | |
| tree | a1a309c150404c63605140544f60eee9287adf26 /include/uapi/linux | |
| parent | 1e28cdeec31333b165f72b6ad647652c4c6f6ff2 (diff) | |
| parent | 8ec017cf31299c4b6287ebe27afe81c986aeef88 (diff) | |
ASoC: Merge up fixes
Merge branch 'for-7.0' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-7.1 for both ASoC and general bug fixes to support testing.
Diffstat (limited to 'include/uapi/linux')
| -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 */ |