Commit 2f5517ae authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25: Move SYSCTL ifdefs into header



Moves the CONFIG_SYSCTL ifdefs in x25_init into header.
Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f950f72
......@@ -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;
};
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment