diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-28 20:21:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-08-01 12:07:53 +0100 |
| commit | 02a7cb2866dd6e3ac7645b594289e1c308b68c4e (patch) | |
| tree | 529db6ab487825a696f0c7df2febf4a392d25baa /net/ipv4 | |
| parent | b7d8912cfd1b72c970f727d7da1c8274d5b18803 (diff) | |
| download | linux-02a7cb2866dd6e3ac7645b594289e1c308b68c4e.tar.bz2 | |
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 <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 2516078aa03e..34eda973bbf1 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -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, |