Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

X25: Move SYSCTL ifdefs into header

Browse Source 
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>
This commit is contained in:
andrew hendry 2009-11-24 15:15:26 +00:00 committed by David S. Miller
parent 9f950f72e5
commit 2f5517aefc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/x25.h
View File

@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(struct sock *);
extern void x25_check_rbuf(struct sock *); extern void x25_check_rbuf(struct sock *);
/* sysctl_net_x25.c */ /* sysctl_net_x25.c */
#ifdef CONFIG_SYSCTL
extern void x25_register_sysctl(void); extern void x25_register_sysctl(void);
extern void x25_unregister_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 { struct x25_skb_cb {
unsigned flags; unsigned flags;
}; };

4
net/x25/af_x25.c
View File

@ -1729,9 +1729,7 @@ static int __init x25_init(void)
printk(KERN_INFO "X.25 for Linux Version 0.2\n"); printk(KERN_INFO "X.25 for Linux Version 0.2\n");
#ifdef CONFIG_SYSCTL
x25_register_sysctl(); x25_register_sysctl();
#endif
x25_proc_init(); x25_proc_init();
out: out:
return rc; return rc;
@ -1744,9 +1742,7 @@ static void __exit x25_exit(void)
x25_link_free(); x25_link_free();
x25_route_free(); x25_route_free();
#ifdef CONFIG_SYSCTL
x25_unregister_sysctl(); x25_unregister_sysctl();
#endif
unregister_netdevice_notifier(&x25_dev_notifier); unregister_netdevice_notifier(&x25_dev_notifier);