From: Eric Dumazet <edumazet@google.com>
Date: Tue, 25 Sep 2012 11:32:13 +0000 (+0000)
Subject: net: remove sk_init() helper
X-Git-Tag: v3.7-rc1~145^2~60
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=e2bcabec6ea5ba30dd2097dc1566e9957d14117c;p=cascardo%2Flinux.git

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>
---

diff --git a/include/net/sock.h b/include/net/sock.h
index f036493b9a61..bc476a19f28e 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 727114cd6f7e..f5a426097236 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 c641549a13e2..80dc7e84b046 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2600,12 +2600,6 @@ static int __init sock_init(void)
 	if (err)
 		goto out;
 
-	/*
-	 *      Initialize sock SLAB cache.
-	 */
-
-	sk_init();
-
 	/*
 	 *      Initialize skbuff SLAB cache
 	 */