| Message ID | 20220309033051.41893-1-dust.li@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net-next] net/smc: fix -Wmissing-prototypes warning when CONFIG_SYSCTL not set | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 9 Mar 2022 11:30:51 +0800 you wrote: > when CONFIG_SYSCTL not set, smc_sysctl_net_init/exit > need to be static inline to avoid missing-prototypes > if compile with W=1. > > Since __net_exit has noinline annotation when CONFIG_NET_NS > not set, it should not be used with static inline. > So remove the __net_init/exit when CONFIG_SYSCTL not set. > > [...] Here is the summary with links: - [net-next] net/smc: fix -Wmissing-prototypes warning when CONFIG_SYSCTL not set https://git.kernel.org/netdev/net-next/c/d9f509915925 You are awesome, thank you!
diff --git a/net/smc/smc_sysctl.h b/net/smc/smc_sysctl.h index 1d554300604d..0becc11bd2f4 100644 --- a/net/smc/smc_sysctl.h +++ b/net/smc/smc_sysctl.h @@ -20,13 +20,13 @@ void __net_exit smc_sysctl_net_exit(struct net *net); #else -int __net_init smc_sysctl_net_init(struct net *net) +static inline int smc_sysctl_net_init(struct net *net) { net->smc.sysctl_autocorking_size = SMC_AUTOCORKING_DEFAULT_SIZE; return 0; } -void __net_exit smc_sysctl_net_exit(struct net *net) { } +static inline void smc_sysctl_net_exit(struct net *net) { } #endif /* CONFIG_SYSCTL */
when CONFIG_SYSCTL not set, smc_sysctl_net_init/exit need to be static inline to avoid missing-prototypes if compile with W=1. Since __net_exit has noinline annotation when CONFIG_NET_NS not set, it should not be used with static inline. So remove the __net_init/exit when CONFIG_SYSCTL not set. Fixes: 7de8eb0d9039 ("net/smc: fix compile warning for smc_sysctl") Signed-off-by: Dust Li <dust.li@linux.alibaba.com> --- net/smc/smc_sysctl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)