aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2009-11-24 15:15:26 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-29 00:24:59 -0800
commit2f5517aefcfbdd7fdf0f03b13d292a10d445887f (patch)
treedfceca6e5ce5a6de91f33f1d0f20e50fd55361ed
parent9f950f72e57fe4bf9b16ace67e4cc5ffcee79d00 (diff)
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>
-rw-r--r--include/net/x25.h6
-rw-r--r--net/x25/af_x25.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda0401156..9baa07dc7d1 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(struct sock *);
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;
};
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2a3a513af3c..f327ef5cb0e 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1729,9 +1729,7 @@ static int __init x25_init(void)
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 @@ static void __exit x25_exit(void)
x25_link_free();
x25_route_free();
-#ifdef CONFIG_SYSCTL
x25_unregister_sysctl();
-#endif
unregister_netdevice_notifier(&x25_dev_notifier);