diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-09-25 07:32:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-27 18:42:00 -0400 |
| commit | e2bcabec6ea5ba30dd2097dc1566e9957d14117c (patch) | |
| tree | 73c09343cd7302aea199bd1e991b81897f8ca5d7 | |
| parent | f54ba7798848ce1385a71b36a2c997422c82220a (diff) | |
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 f036493b9a61..bc476a19f28e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -2229,8 +2229,6 @@ extern int net_msg_warn; | |||
| 2229 | extern __u32 sysctl_wmem_max; | 2229 | extern __u32 sysctl_wmem_max; |
| 2230 | extern __u32 sysctl_rmem_max; | 2230 | extern __u32 sysctl_rmem_max; |
| 2231 | 2231 | ||
| 2232 | extern void sk_init(void); | ||
| 2233 | |||
| 2234 | extern int sysctl_optmem_max; | 2232 | extern int sysctl_optmem_max; |
| 2235 | 2233 | ||
| 2236 | extern __u32 sysctl_wmem_default; | 2234 | 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) | |||
| 1464 | } | 1464 | } |
| 1465 | EXPORT_SYMBOL_GPL(sk_setup_caps); | 1465 | EXPORT_SYMBOL_GPL(sk_setup_caps); |
| 1466 | 1466 | ||
| 1467 | void __init sk_init(void) | ||
| 1468 | { | ||
| 1469 | if (totalram_pages <= 4096) { | ||
| 1470 | sysctl_wmem_max = 32767; | ||
| 1471 | sysctl_rmem_max = 32767; | ||
| 1472 | sysctl_wmem_default = 32767; | ||
| 1473 | sysctl_rmem_default = 32767; | ||
| 1474 | } else if (totalram_pages >= 131072) { | ||
| 1475 | sysctl_wmem_max = 131071; | ||
| 1476 | sysctl_rmem_max = 131071; | ||
| 1477 | } | ||
| 1478 | } | ||
| 1479 | |||
| 1480 | /* | 1467 | /* |
| 1481 | * Simple resource managers for sockets. | 1468 | * Simple resource managers for sockets. |
| 1482 | */ | 1469 | */ |
diff --git a/net/socket.c b/net/socket.c index c641549a13e2..80dc7e84b046 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -2601,12 +2601,6 @@ static int __init sock_init(void) | |||
| 2601 | goto out; | 2601 | goto out; |
| 2602 | 2602 | ||
| 2603 | /* | 2603 | /* |
| 2604 | * Initialize sock SLAB cache. | ||
| 2605 | */ | ||
| 2606 | |||
| 2607 | sk_init(); | ||
| 2608 | |||
| 2609 | /* | ||
| 2610 | * Initialize skbuff SLAB cache | 2604 | * Initialize skbuff SLAB cache |
| 2611 | */ | 2605 | */ |
| 2612 | skb_init(); | 2606 | skb_init(); |
