diff options
Diffstat (limited to 'include/net/ipv6.h')
-rw-r--r-- | include/net/ipv6.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index e82f1814d96b..1c98e737dbd0 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -591,8 +591,8 @@ extern int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf, | |||
591 | int __user *optlen); | 591 | int __user *optlen); |
592 | 592 | ||
593 | #ifdef CONFIG_PROC_FS | 593 | #ifdef CONFIG_PROC_FS |
594 | extern int ac6_proc_init(void); | 594 | extern int ac6_proc_init(struct net *net); |
595 | extern void ac6_proc_exit(void); | 595 | extern void ac6_proc_exit(struct net *net); |
596 | extern int raw6_proc_init(void); | 596 | extern int raw6_proc_init(void); |
597 | extern void raw6_proc_exit(void); | 597 | extern void raw6_proc_exit(void); |
598 | extern int tcp6_proc_init(struct net *net); | 598 | extern int tcp6_proc_init(struct net *net); |
@@ -607,15 +607,10 @@ extern int snmp6_register_dev(struct inet6_dev *idev); | |||
607 | extern int snmp6_unregister_dev(struct inet6_dev *idev); | 607 | extern int snmp6_unregister_dev(struct inet6_dev *idev); |
608 | 608 | ||
609 | #else | 609 | #else |
610 | static inline int snmp6_register_dev(struct inet6_dev *idev) | 610 | static inline int ac6_proc_init(struct net *net) { return 0; } |
611 | { | 611 | static inline void ac6_proc_exit(struct net *net) { } |
612 | return 0; | 612 | static inline int snmp6_register_dev(struct inet6_dev *idev) { return 0; } |
613 | } | 613 | static inline int snmp6_unregister_dev(struct inet6_dev *idev) { return 0; } |
614 | |||
615 | static inline int snmp6_unregister_dev(struct inet6_dev *idev) | ||
616 | { | ||
617 | return 0; | ||
618 | } | ||
619 | #endif | 614 | #endif |
620 | 615 | ||
621 | #ifdef CONFIG_SYSCTL | 616 | #ifdef CONFIG_SYSCTL |