Commit 6baf1f41 authored Sep 05, 2005 by David S. Miller

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

parent aa07ca57

include/net/sock.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1377,9 +1377,10 @@ extern void sk_init(void);

	#ifdef CONFIG_SYSCTL		#ifdef CONFIG_SYSCTL
	extern struct ctl_table core_table[];		extern struct ctl_table core_table[];
	extern int sysctl_optmem_max;
	#endif		#endif

			extern int sysctl_optmem_max;

	extern __u32 sysctl_wmem_default;		extern __u32 sysctl_wmem_default;
	extern __u32 sysctl_rmem_default;		extern __u32 sysctl_rmem_default;

net/core/sock.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1719,8 +1719,8 @@ EXPORT_SYMBOL(sock_wfree);
	EXPORT_SYMBOL(sock_wmalloc);		EXPORT_SYMBOL(sock_wmalloc);
	EXPORT_SYMBOL(sock_i_uid);		EXPORT_SYMBOL(sock_i_uid);
	EXPORT_SYMBOL(sock_i_ino);		EXPORT_SYMBOL(sock_i_ino);
	#ifdef CONFIG_SYSCTL
	EXPORT_SYMBOL(sysctl_optmem_max);		EXPORT_SYMBOL(sysctl_optmem_max);
			#ifdef CONFIG_SYSCTL
	EXPORT_SYMBOL(sysctl_rmem_max);		EXPORT_SYMBOL(sysctl_rmem_max);
	EXPORT_SYMBOL(sysctl_wmem_max);		EXPORT_SYMBOL(sysctl_wmem_max);
	#endif		#endif