diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-01-14 11:05:52 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-01-14 11:05:52 +0100 |
| commit | a46fe1fe0144306c7d2cf3f5d4e44a7da31847f6 (patch) | |
| tree | 93750672c10885f4e52eb9e296f130b6a9f1bc08 /include/net | |
| parent | 735668f8e5c99698100e9df1e296f76a51c3c83a (diff) | |
| parent | fd4e9308312972d5bd11fe1d8c032b95b44748cb (diff) | |
| download | linux-a46fe1fe0144306c7d2cf3f5d4e44a7da31847f6.tar.gz linux-a46fe1fe0144306c7d2cf3f5d4e44a7da31847f6.zip | |
Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow
Andi is unavailable for some time. So, I take over his work for this
mergewindow.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_tables.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 4afa64c81304..0027beca5cd5 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -733,15 +733,18 @@ struct nft_set_ext_tmpl { /** * struct nft_set_ext - set extensions * - * @genmask: generation mask + * @genmask: generation mask, but also flags (see NFT_SET_ELEM_DEAD_BIT) * @offset: offsets of individual extension types * @data: beginning of extension data + * + * This structure must be aligned to word size, otherwise atomic bitops + * on genmask field can cause alignment failure on some archs. */ struct nft_set_ext { u8 genmask; u8 offset[NFT_SET_EXT_NUM]; char data[]; -}; +} __aligned(BITS_PER_LONG / 8); static inline void nft_set_ext_prepare(struct nft_set_ext_tmpl *tmpl) { |