udp: Remove redundant __udp_sysctl_init() call from udp_init().
Subsystems (3)
PATCH 1/1 udp: Remove redundant __udp_sysctl_init() call from udp_init().
__udp_sysctl_init() is called for init_net via udp_sysctl_ops.
While at it, we can rename __udp_sysctl_init() to udp_sysctl_init().
Fixes 1e8029515816 ("udp: Move the udp sysctl to namespace.")
Signed-off-by Kuniyuki Iwashima <[email protected]>
--- net/ipv4/udp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
net/ipv4/udp.c +1 -7
@@ -3264,7 +3264,7 @@ u32 udp_flow_hashrnd(void) }EXPORT_SYMBOL (udp_flow_hashrnd); -static void __udp_sysctl_init (struct net *net) +static int __net_init udp_sysctl_init (struct net *net) { net->ipv4.sysctl_udp_rmem_min =PAGE_SIZE ; net->ipv4.sysctl_udp_wmem_min =PAGE_SIZE ;
@@ -3272,11 +3272,7 @@ static void __udp_sysctl_init(struct net *net)#ifdef CONFIG_NET_L3_MASTER_DEV net->ipv4.sysctl_udp_l3mdev_accept =0 ;#endif -} -static int __net_init udp_sysctl_init (struct net *net) -{ -__udp_sysctl_init (net);return 0 ; }
@@ -3352,8 +3348,6 @@ void __init udp_init(void) sysctl_udp_mem[1 ] = limit; sysctl_udp_mem[2 ] = sysctl_udp_mem[0 ] *2 ; -__udp_sysctl_init (&init_net); -/* 16 spinlocks per cpu */ udp_busylocks_log =ilog2 (nr_cpu_ids) +4 ; udp_busylocks = kmalloc(sizeof(spinlock_t) << udp_busylocks_log,
Signature · 1 line
2.30.2
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 28 Jul 2022 20:21:37 -0700 you wrote:
__udp_sysctl_init()is called forinit_netviaudp_sysctl_ops.While at it, we can rename
__udp_sysctl_init()toudp_sysctl_init().Fixes 1e8029515816 ("udp: Move the udp sysctl to namespace.")Signed-off-by Kuniyuki Iwashima <[email protected]>[...]
Here is the summary with links:
- [v1,net-next] udp: Remove redundant __udp_sysctl_init() call from udp_init().
https://git.kernel.org/netdev/net-next/c/02a7cb2866dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html