aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-01-22 03:18:38 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:27 -0500
commit2334ecbdb27bd1745c0fc6d05cce09ed9585e4c1 (patch)
tree58f31ad3d238fbb8e1073770f8f483ae2a752aa1
parent40fee36e11b49f92bc7c385bd45d7805c0127a34 (diff)
[IPV6]: Sparse: Declare non-static ipv6_{route,icmp,frag}_sysctl_init() in header.
Fix the following sparse warnings: | net/ipv6/route.c:2491:18: warning: symbol 'ipv6_route_sysctl_init' was not declared. Should it be static? | net/ipv6/icmp.c:922:18: warning: symbol 'ipv6_icmp_sysctl_init' was not declared. Should it be static? | net/ipv6/reassembly.c:628:6: warning: symbol 'ipv6_frag_sysctl_init' was not declared. Should it be static? Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-rw-r--r--include/net/ipv6.h4
-rw-r--r--net/ipv6/af_inet6.c2
-rw-r--r--net/ipv6/sysctl_net_ipv6.c3
3 files changed, 4 insertions, 5 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index c8e8cb24109..3712caeae74 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
589extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
590extern void ipv6_frag_sysctl_init(struct net *net);
591extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
592
589extern int ac6_proc_init(void); 593extern int ac6_proc_init(void);
590extern void ac6_proc_exit(void); 594extern void ac6_proc_exit(void);
591extern int raw6_proc_init(void); 595extern int raw6_proc_init(void);
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3150c4be3c0..6738a7b0e67 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -72,8 +72,6 @@ MODULE_LICENSE("GPL");
72static struct list_head inetsw6[SOCK_MAX]; 72static struct list_head inetsw6[SOCK_MAX];
73static DEFINE_SPINLOCK(inetsw6_lock); 73static DEFINE_SPINLOCK(inetsw6_lock);
74 74
75void ipv6_frag_sysctl_init(struct net *net);
76
77static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) 75static __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 5e0af4d4632..7197eb74a75 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
17extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
18extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
19
20static ctl_table ipv6_table_template[] = { 17static ctl_table ipv6_table_template[] = {
21 { 18 {
22 .ctl_name = NET_IPV6_ROUTE, 19 .ctl_name = NET_IPV6_ROUTE,