| Message ID | m1lilmt7v5.fsf_-_@fess.ebiederm.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 04/23/2012 03:13 PM, Eric W. Biederman wrote: > > Randy Dunlap <rdunlap@xenotime.net> 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 <ebiederm@xmission.com> Yep, that works. Acked-by: Randy Dunlap <rdunlap@xenotime.net> 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 */
From: Randy Dunlap <rdunlap@xenotime.net> Date: Mon, 23 Apr 2012 15:38:45 -0700 > On 04/23/2012 03:13 PM, Eric W. Biederman wrote: > >> >> Randy Dunlap <rdunlap@xenotime.net> 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 <ebiederm@xmission.com> > > > Yep, that works. > > Acked-by: Randy Dunlap <rdunlap@xenotime.net> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 */