Commit cc0cf10f authored by Martin Kaiser's avatar Martin Kaiser Committed by Jakub Kicinski
Browse files

net: bridge: fix static key check 



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: 971502d7 ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Reviewed-by: default avatarFlorian Westphal <fw@strlen.de>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20260127101925.1754425-1-martin@kaiser.cx


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d2492688

net/bridge/br_input.c

+1 −1
Original line number Diff line number Diff line
@@ -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