diff options
-rw-r--r-- | include/net/ipv6.h | 4 | ||||
-rw-r--r-- | net/ipv6/af_inet6.c | 2 | ||||
-rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index c8e8cb241090..3712caeae74e 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -586,6 +586,10 @@ extern int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf, | |||
586 | int __user *optlen); | 586 | int __user *optlen); |
587 | 587 | ||
588 | #ifdef CONFIG_PROC_FS | 588 | #ifdef CONFIG_PROC_FS |
589 | extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); | ||
590 | extern void ipv6_frag_sysctl_init(struct net *net); | ||
591 | extern struct ctl_table *ipv6_route_sysctl_init(struct net *net); | ||
592 | |||
589 | extern int ac6_proc_init(void); | 593 | extern int ac6_proc_init(void); |
590 | extern void ac6_proc_exit(void); | 594 | extern void ac6_proc_exit(void); |
591 | extern int raw6_proc_init(void); | 595 | extern int raw6_proc_init(void); |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 3150c4be3c0c..6738a7b0e67f 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -72,8 +72,6 @@ MODULE_LICENSE("GPL"); | |||
72 | static struct list_head inetsw6[SOCK_MAX]; | 72 | static struct list_head inetsw6[SOCK_MAX]; |
73 | static DEFINE_SPINLOCK(inetsw6_lock); | 73 | static DEFINE_SPINLOCK(inetsw6_lock); |
74 | 74 | ||
75 | void ipv6_frag_sysctl_init(struct net *net); | ||
76 | |||
77 | static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) | 75 | static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) |
78 | { | 76 | { |
79 | const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo); | 77 | const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo); |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 5e0af4d46324..7197eb74a755 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
@@ -14,9 +14,6 @@ | |||
14 | #include <net/addrconf.h> | 14 | #include <net/addrconf.h> |
15 | #include <net/inet_frag.h> | 15 | #include <net/inet_frag.h> |
16 | 16 | ||
17 | extern struct ctl_table *ipv6_route_sysctl_init(struct net *net); | ||
18 | extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); | ||
19 | |||
20 | static ctl_table ipv6_table_template[] = { | 17 | static ctl_table ipv6_table_template[] = { |
21 | { | 18 | { |
22 | .ctl_name = NET_IPV6_ROUTE, | 19 | .ctl_name = NET_IPV6_ROUTE, |