From: David S. Miller Date: Tue, 6 Sep 2005 01:14:11 +0000 (-0700) Subject: [NET]: Do not protect sysctl_optmem_max with CONFIG_SYSCTL X-Git-Tag: v2.6.14-rc1~758 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6baf1f417d092bd2de7c8892cecad456024c993f;p=linux-2.6-omap-h63xx.git [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 --- diff --git a/include/net/sock.h b/include/net/sock.h index cf628261da5..8c48fbecb7c 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 ccd10fd6568..c13594579bf 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