Re: [PATCH] net: bridge: Replace deprecated build flag HAVE_JUMP_LABEL with CONFIG_JUMP_LABEL
From: Simon Horman <horms@kernel.org>
Date: 2024-03-05 15:53:32
Also in:
bridge, lkml
+ Masahiro Yamada [off-list ref] On Tue, Mar 05, 2024 at 10:42:04PM +0800, Zixuan Tan wrote:
The build flag HAVE_JUMP_LABEL has been deprecated and removed in commit
e9666d10a567 ("jump_label: move 'asm goto' support test to Kconfig").
It is no longer defined or used. The correct flag to use is CONFIG_JUMP_LABEL.
Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in
bridge input path")
Signed-off-by: Zixuan Tan <redacted>This patch seems to be mangled somehow and doesn't apply. However, I believe that the change described by it is correct. Reviewed-by: Simon Horman <horms@kernel.org>
quoted hunk ↗ jump to hunk
--- net/bridge/br_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index f21097e73482..3700e47ff181 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c@@ -255,7 +255,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 -- 2.40.1