net: remove sk_init() helper
It seems sk_init() has no value today and even does strange things : # grep . /proc/sys/net/core/?mem_* /proc/sys/net/core/rmem_default:212992 /proc/sys/net/core/rmem_max:131071 /proc/sys/net/core/wmem_default:212992 /proc/sys/net/core/wmem_max:131071 We can remove it completely. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Shan Wei <davidshan@tencent.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f54ba77988
commit
e2bcabec6e
|
@ -2229,8 +2229,6 @@ extern int net_msg_warn;
|
|||
extern __u32 sysctl_wmem_max;
|
||||
extern __u32 sysctl_rmem_max;
|
||||
|
||||
extern void sk_init(void);
|
||||
|
||||
extern int sysctl_optmem_max;
|
||||
|
||||
extern __u32 sysctl_wmem_default;
|
||||
|
|
|
@ -1464,19 +1464,6 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(sk_setup_caps);
|
||||
|
||||
void __init sk_init(void)
|
||||
{
|
||||
if (totalram_pages <= 4096) {
|
||||
sysctl_wmem_max = 32767;
|
||||
sysctl_rmem_max = 32767;
|
||||
sysctl_wmem_default = 32767;
|
||||
sysctl_rmem_default = 32767;
|
||||
} else if (totalram_pages >= 131072) {
|
||||
sysctl_wmem_max = 131071;
|
||||
sysctl_rmem_max = 131071;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Simple resource managers for sockets.
|
||||
*/
|
||||
|
|
|
@ -2600,12 +2600,6 @@ static int __init sock_init(void)
|
|||
if (err)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* Initialize sock SLAB cache.
|
||||
*/
|
||||
|
||||
sk_init();
|
||||
|
||||
/*
|
||||
* Initialize skbuff SLAB cache
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue