From f83290815801b9602e2e75b73147c34c44aed15b Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Tue, 5 Feb 2008 02:57:59 -0800 Subject: [PATCH] --- yaml --- r: 83271 b: refs/heads/master c: 6de1a9104034a2c58db3abdaf03cddb507225137 h: refs/heads/master i: 83269: 5142ed5f974bbda3355acb4c38b57d2110b4f1e6 83267: 8d90a5d589060035704037cd551e345601344d96 83263: 1417b3e8c7c256359d29729461ba175cc32935b3 v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f7cf530ae214..334b39cf6f41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aead543479e7f20013217fe3fc33a604fdd8944 +refs/heads/master: 6de1a9104034a2c58db3abdaf03cddb507225137 diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h index fa80ea48639d..c0c019f72ba9 100644 --- a/trunk/include/net/ipv6.h +++ b/trunk/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