Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6baf1f41 authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent aa07ca57

include/net/sock.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -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