netfilter: bpf_link: avoid unused-function warning
Subsystems (4)
PATCH 1/1 netfilter: bpf_link: avoid unused-function warning
From: Arnd Bergmann <[email protected]>
The newly added function is unused in some random configurations:
net/netfilter/nf_bpf_link.c:32:1: error: 'get_proto_defrag_hook' defined but not used [-Werror=unused-function]
32 | get_proto_defrag_hook(struct bpf_nf_link *link,
| ^~~~~~~~~~~~~~~~~~~~~
Change the preprocessor conditionals to if() checks that the compiler can understand to avoid the warning.
--- net/netfilter/nf_bpf_link.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/netfilter/nf_bpf_link.c +6 -4
@@ -74,24 +74,26 @@ static int bpf_nf_enable_defrag(struct bpf_nf_link *link)const struct nf_defrag_hook __maybe_unused *hook;switch (link->hook_ops.pf) { -#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV4 )case NFPROTO_IPV4 : +if (!IS_ENABLED (CONFIG_NF_DEFRAG_IPV4 )) +return -EAFNOSUPPORT ; + hook =get_proto_defrag_hook (link, nf_defrag_v4_hook,"nf_defrag_ipv4" );if (IS_ERR (hook))return PTR_ERR (hook); link->defrag_hook = hook;return 0 ; -#endif -#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )case NFPROTO_IPV6 : +if (!IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )) +return -EAFNOSUPPORT ; + hook =get_proto_defrag_hook (link, nf_defrag_v6_hook,"nf_defrag_ipv6" );if (IS_ERR (hook))return PTR_ERR (hook); link->defrag_hook = hook;return 0 ; -#endif default :return -EAFNOSUPPORT ; }
Signature · 1 line
2.39.2
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added function is unused in some random configurations:
net/netfilter/nf_bpf_link.c:32:1: error: 'get_proto_defrag_hook' defined but not used [-Werror=unused-function]
32 | get_proto_defrag_hook(structbpf_nf_link*link,| ^~~~~~~~~~~~~~~~~~~~~
This was fixed in 81584c23f249 ("netfilter: bpf: Only define get_proto_defrag_hook() if necessary").
Thanks,
Daniel
Quoted 7 lines · Daniel Xu
Hi Arnd,
Quoted 4 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added function is unused in some random configurations:
Quoted 7 lines
Quoted 4 lines
net/netfilter/nf_bpf_link.c:32:1: error: 'get_proto_defrag_hook' defined but not used [-Werror=unused-function]
32 | get_proto_defrag_hook(structbpf_nf_link*link,| ^~~~~~~~~~~~~~~~~~~~~This was fixed in
81584c23f249("netfilter: bpf: Only defineget_proto_defrag_hook()if necessary").
Ok, I guess this will be in tomorrow's linux-next then, right?
Arnd
Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Daniel Xu
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added function is unused in some random configurations:
net/netfilter/nf_bpf_link.c:32:1: error: 'get_proto_defrag_hook' defined but not used [-Werror=unused-function]
32 | get_proto_defrag_hook(structbpf_nf_link*link,| ^~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
Quoted 2 lines
This was fixed in
81584c23f249("netfilter: bpf: Only defineget_proto_defrag_hook()if necessary").Ok, I guess this will be in tomorrow's linux-next then, right?
Arnd
I'm not too familiar with the linux-next process, but chatgpt is telling me it should be.
Thanks,
Daniel