diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:49:37 +0100 |
| commit | 4589f199eb68afd462bd792f730c7936fe3dafb5 (patch) | |
| tree | 3c12ca1431b72ec6746df4d8b99780a3ba0d5cc5 /net/netfilter/nft_ct.c | |
| parent | 03c11eb3b16dc0058589751dfd91f254be2be613 (diff) | |
| parent | 4461438a8405e800f90e0e40409e5f3d07eed381 (diff) | |
| download | linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.gz | |
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
Merge in pending alternatives patching infrastructure changes, before
applying more patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netfilter/nft_ct.c')
| -rw-r--r-- | net/netfilter/nft_ct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index bfd3e5a14dab6..d73d49c7acd66 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -754,7 +754,7 @@ static bool nft_ct_set_reduce(struct nft_regs_track *track, return false; } -#ifdef CONFIG_RETPOLINE +#ifdef CONFIG_MITIGATION_RETPOLINE static const struct nft_expr_ops nft_ct_get_fast_ops = { .type = &nft_ct_type, .size = NFT_EXPR_SIZE(sizeof(struct nft_ct)), @@ -799,7 +799,7 @@ nft_ct_select_ops(const struct nft_ctx *ctx, return ERR_PTR(-EINVAL); if (tb[NFTA_CT_DREG]) { -#ifdef CONFIG_RETPOLINE +#ifdef CONFIG_MITIGATION_RETPOLINE u32 k = ntohl(nla_get_be32(tb[NFTA_CT_KEY])); switch (k) { |