diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-05 21:14:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-05 21:14:11 -0400 |
commit | 6baf1f417d092bd2de7c8892cecad456024c993f (patch) | |
tree | c4af445058eca6f68186286651a0622abd0611f6 | |
parent | aa07ca5793414ce257ad98809147bd1dbb7a3837 (diff) |
[NET]: Do not protect sysctl_optmem_max with CONFIG_SYSCTL
The ipv4 and ipv6 protocols need to access it unconditionally.
SYSCTL=n build failure reported by Russell King.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/sock.h | 3 | ||||
-rw-r--r-- | net/core/sock.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index cf628261da52..8c48fbecb7cf 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1377,9 +1377,10 @@ extern void sk_init(void); | |||
1377 | 1377 | ||
1378 | #ifdef CONFIG_SYSCTL | 1378 | #ifdef CONFIG_SYSCTL |
1379 | extern struct ctl_table core_table[]; | 1379 | extern struct ctl_table core_table[]; |
1380 | extern int sysctl_optmem_max; | ||
1381 | #endif | 1380 | #endif |
1382 | 1381 | ||
1382 | extern int sysctl_optmem_max; | ||
1383 | |||
1383 | extern __u32 sysctl_wmem_default; | 1384 | extern __u32 sysctl_wmem_default; |
1384 | extern __u32 sysctl_rmem_default; | 1385 | extern __u32 sysctl_rmem_default; |
1385 | 1386 | ||
diff --git a/net/core/sock.c b/net/core/sock.c index ccd10fd65682..c13594579bfb 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1719,8 +1719,8 @@ EXPORT_SYMBOL(sock_wfree); | |||
1719 | EXPORT_SYMBOL(sock_wmalloc); | 1719 | EXPORT_SYMBOL(sock_wmalloc); |
1720 | EXPORT_SYMBOL(sock_i_uid); | 1720 | EXPORT_SYMBOL(sock_i_uid); |
1721 | EXPORT_SYMBOL(sock_i_ino); | 1721 | EXPORT_SYMBOL(sock_i_ino); |
1722 | #ifdef CONFIG_SYSCTL | ||
1723 | EXPORT_SYMBOL(sysctl_optmem_max); | 1722 | EXPORT_SYMBOL(sysctl_optmem_max); |
1723 | #ifdef CONFIG_SYSCTL | ||
1724 | EXPORT_SYMBOL(sysctl_rmem_max); | 1724 | EXPORT_SYMBOL(sysctl_rmem_max); |
1725 | EXPORT_SYMBOL(sysctl_wmem_max); | 1725 | EXPORT_SYMBOL(sysctl_wmem_max); |
1726 | #endif | 1726 | #endif |