]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: bridge: fix static key check
authorMartin Kaiser <martin@kaiser.cx>
Tue, 27 Jan 2026 10:19:23 +0000 (11:19 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 29 Jan 2026 03:34:01 +0000 (19:34 -0800)
Fix the check if netfilter's static keys are available. netfilter defines
and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL
is never defined.)

Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Reviewed-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20260127101925.1754425-1-martin@kaiser.cx
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/bridge/br_input.c

index e355a15bf5ab13e603ceed2b99e56ddeffdecbb2..1405f1061a5493af51bc29757ec09d62e1d9ee99 100644 (file)
@@ -274,7 +274,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)
        int ret;
 
        net = dev_net(skb->dev);
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
        if (!static_key_false(&nf_hooks_needed[NFPROTO_BRIDGE][NF_BR_PRE_ROUTING]))
                goto frame_finish;
 #endif