commit 2f5517aefcfbdd7fdf0f03b13d292a10d445887f
author andrew hendry <andrew.hendry@gmail.com> Tue Nov 24 15:15:26 2009 +0000
committer David S. Miller <davem@davemloft.net> Sun Nov 29 00:24:59 2009 -0800
tree dfceca6e5ce5a6de91f33f1d0f20e50fd55361ed
parent 9f950f72e57fe4bf9b16ace67e4cc5ffcee79d00

X25: Move SYSCTL ifdefs into header

Moves the CONFIG_SYSCTL ifdefs in x25_init into header.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/net/x25.h

diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda040..9baa07d 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -287,8 +287,14 @@
 extern void x25_check_rbuf(struct sock *);
 
 /* sysctl_net_x25.c */
+#ifdef CONFIG_SYSCTL
 extern void x25_register_sysctl(void);
 extern void x25_unregister_sysctl(void);
+#else
+static inline void x25_register_sysctl(void) {};
+static inline void x25_unregister_sysctl(void) {};
+#endif /* CONFIG_SYSCTL */
+
 struct x25_skb_cb {
 	unsigned flags;
 };

net/x25/af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2a3a513..f327ef5 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1729,9 +1729,7 @@
 
 	printk(KERN_INFO "X.25 for Linux Version 0.2\n");
 
-#ifdef CONFIG_SYSCTL
 	x25_register_sysctl();
-#endif
 	x25_proc_init();
 out:
 	return rc;
@@ -1744,9 +1742,7 @@
 	x25_link_free();
 	x25_route_free();
 
-#ifdef CONFIG_SYSCTL
 	x25_unregister_sysctl();
-#endif
 
 	unregister_netdevice_notifier(&x25_dev_notifier);