diff options
| author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-02-05 02:57:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-05 02:57:59 -0800 |
| commit | 6de1a9104034a2c58db3abdaf03cddb507225137 (patch) | |
| tree | a61b548edb8bd65884e9d288e782df83ba5ed8dc /include/net | |
| parent | 0aead543479e7f20013217fe3fc33a604fdd8944 (diff) | |
| download | linux-3.10-6de1a9104034a2c58db3abdaf03cddb507225137.tar.gz linux-3.10-6de1a9104034a2c58db3abdaf03cddb507225137.tar.bz2 linux-3.10-6de1a9104034a2c58db3abdaf03cddb507225137.zip | |
[IPV6]: Fix sysctl compilation error.
Move ipv6_icmp_sysctl_init and ipv6_route_sysctl_init into the right
ifdef section otherwise that does not compile when CONFIG_SYSCTL=yes
and CONFIG_PROC_FS=no
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index fa80ea48639..c0c019f72ba 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -110,7 +110,6 @@ struct frag_hdr { /* sysctls */ extern int sysctl_mld_max_msf; - extern struct ctl_path net_ipv6_ctl_path[]; #define _DEVINC(statname, modifier, idev, field) \ @@ -586,9 +585,6 @@ extern int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf, int __user *optlen); #ifdef CONFIG_PROC_FS -extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); -extern struct ctl_table *ipv6_route_sysctl_init(struct net *net); - extern int ac6_proc_init(void); extern void ac6_proc_exit(void); extern int raw6_proc_init(void); @@ -621,6 +617,8 @@ static inline int snmp6_unregister_dev(struct inet6_dev *idev) extern ctl_table ipv6_route_table_template[]; extern ctl_table ipv6_icmp_table_template[]; +extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); +extern struct ctl_table *ipv6_route_sysctl_init(struct net *net); extern int ipv6_sysctl_register(void); extern void ipv6_sysctl_unregister(void); #endif |