diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-09-25 11:32:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-27 18:42:00 -0400 |
| commit | e2bcabec6ea5ba30dd2097dc1566e9957d14117c (patch) | |
| tree | 73c09343cd7302aea199bd1e991b81897f8ca5d7 | |
| parent | f54ba7798848ce1385a71b36a2c997422c82220a (diff) | |
| download | op-kernel-dev-e2bcabec6ea5ba30dd2097dc1566e9957d14117c.zip op-kernel-dev-e2bcabec6ea5ba30dd2097dc1566e9957d14117c.tar.gz | |
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>
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 13 | ||||
| -rw-r--r-- | net/socket.c | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index f036493..bc476a1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -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; diff --git a/net/core/sock.c b/net/core/sock.c index 727114c..f5a4260 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -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. */ diff --git a/net/socket.c b/net/socket.c index c641549..80dc7e8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2601,12 +2601,6 @@ static int __init sock_init(void) goto out; /* - * Initialize sock SLAB cache. - */ - - sk_init(); - - /* * Initialize skbuff SLAB cache */ skb_init(); |
