summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-05 18:14:11 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-05 18:14:11 -0700
commit6baf1f417d092bd2de7c8892cecad456024c993f (patch)
treec4af445058eca6f68186286651a0622abd0611f6
parentaa07ca5793414ce257ad98809147bd1dbb7a3837 (diff)
downloadop-kernel-dev-6baf1f417d092bd2de7c8892cecad456024c993f.zip
op-kernel-dev-6baf1f417d092bd2de7c8892cecad456024c993f.tar.gz
[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.h3
-rw-r--r--net/core/sock.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index cf62826..8c48fbe 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1377,9 +1377,10 @@ extern void sk_init(void);
#ifdef CONFIG_SYSCTL
extern struct ctl_table core_table[];
-extern int sysctl_optmem_max;
#endif
+extern int sysctl_optmem_max;
+
extern __u32 sysctl_wmem_default;
extern __u32 sysctl_rmem_default;
diff --git a/net/core/sock.c b/net/core/sock.c
index ccd10fd..c1359457 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1719,8 +1719,8 @@ EXPORT_SYMBOL(sock_wfree);
EXPORT_SYMBOL(sock_wmalloc);
EXPORT_SYMBOL(sock_i_uid);
EXPORT_SYMBOL(sock_i_ino);
-#ifdef CONFIG_SYSCTL
EXPORT_SYMBOL(sysctl_optmem_max);
+#ifdef CONFIG_SYSCTL
EXPORT_SYMBOL(sysctl_rmem_max);
EXPORT_SYMBOL(sysctl_wmem_max);
#endif
OpenPOWER on IntegriCloud