From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [PATCH] net sysctl: Add place holder functions for when sysctl support is compiled out of the kernel. Date: Mon, 23 Apr 2012 15:38:45 -0700 Message-ID: <4F95D9F5.3040407@xenotime.net> References: <20120423170701.c96e402234b1387dece11dda@canb.auug.org.au> <4F958598.6080305@xenotime.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: David Miller , Stephen Rothwell , linux-next@vger.kernel.org, LKML , netdev@vger.kernel.org To: "Eric W. Biederman" Return-path: In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 04/23/2012 03:13 PM, Eric W. Biederman wrote: > > Randy Dunlap reported: >> On 04/23/2012 12:07 AM, Stephen Rothwell wrote: >> >>> Hi all, >>> >>> Changes since 20120420: >> >> >> >> ERROR: "unregister_net_sysctl_table" [net/phonet/phonet.ko] undefined! >> ERROR: "register_net_sysctl" [net/phonet/phonet.ko] undefined! >> >> when CONFIG_SYSCTL is not enabled. > > Add static inline stub functions to gracefully handle the case when sysctl > support is not present. > > Signed-off-by: Eric W. Biederman Yep, that works. Acked-by: Randy Dunlap Thanks. > --- > include/net/net_namespace.h | 15 ++++++++++++--- > 1 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h > index 3ee4a3d..ac9195e 100644 > --- a/include/net/net_namespace.h > +++ b/include/net/net_namespace.h > @@ -284,11 +284,20 @@ struct ctl_table_header; > > #ifdef CONFIG_SYSCTL > extern int net_sysctl_init(void); > -#else > -static inline int net_sysctl_init(void) { return 0; } > -#endif > extern struct ctl_table_header *register_net_sysctl(struct net *net, > const char *path, struct ctl_table *table); > extern void unregister_net_sysctl_table(struct ctl_table_header *header); > +#else > +static inline int net_sysctl_init(void) { return 0; } > +static inline struct ctl_table_header *register_net_sysctl(struct net *net, > + const char *path, struct ctl_table *table) > +{ > + return NULL; > +} > +static inline void unregister_net_sysctl_table(struct ctl_table_header *header) > +{ > +} > +#endif > + > > #endif /* __NET_NET_NAMESPACE_H */ -- ~Randy