aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-16 01:18:02 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 19:01:32 -0400
commit20380731bc2897f2952ae055420972ded4cd786e (patch)
treeabd31e5ebfadcf4f9024634eec8b11855029e512 /net/socket.c
parent9deff7f2365958c5c5aa8cb5a0dd651c4dd83f8f (diff)
[NET]: Fix sparse warnings
Of this type, mostly: CHECK net/ipv6/netfilter.c net/ipv6/netfilter.c:96:12: warning: symbol 'ipv6_netfilter_init' was not declared. Should it be static? net/ipv6/netfilter.c:101:6: warning: symbol 'ipv6_netfilter_fini' was not declared. Should it be static? Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c
index 5f76ab8a159..ce69b7862f5 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -70,6 +70,8 @@
70#include <linux/seq_file.h> 70#include <linux/seq_file.h>
71#include <linux/wanrouter.h> 71#include <linux/wanrouter.h>
72#include <linux/if_bridge.h> 72#include <linux/if_bridge.h>
73#include <linux/if_frad.h>
74#include <linux/if_vlan.h>
73#include <linux/init.h> 75#include <linux/init.h>
74#include <linux/poll.h> 76#include <linux/poll.h>
75#include <linux/cache.h> 77#include <linux/cache.h>
@@ -724,8 +726,8 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
724 return __sock_sendmsg(iocb, sock, &x->async_msg, size); 726 return __sock_sendmsg(iocb, sock, &x->async_msg, size);
725} 727}
726 728
727ssize_t sock_sendpage(struct file *file, struct page *page, 729static ssize_t sock_sendpage(struct file *file, struct page *page,
728 int offset, size_t size, loff_t *ppos, int more) 730 int offset, size_t size, loff_t *ppos, int more)
729{ 731{
730 struct socket *sock; 732 struct socket *sock;
731 int flags; 733 int flags;
@@ -948,7 +950,7 @@ static int sock_mmap(struct file * file, struct vm_area_struct * vma)
948 return sock->ops->mmap(file, sock, vma); 950 return sock->ops->mmap(file, sock, vma);
949} 951}
950 952
951int sock_close(struct inode *inode, struct file *filp) 953static int sock_close(struct inode *inode, struct file *filp)
952{ 954{
953 /* 955 /*
954 * It was possible the inode is NULL we were 956 * It was possible the inode is NULL we were
@@ -2027,9 +2029,6 @@ int sock_unregister(int family)
2027 return 0; 2029 return 0;
2028} 2030}
2029 2031
2030
2031extern void sk_init(void);
2032
2033void __init sock_init(void) 2032void __init sock_init(void)
2034{ 2033{
2035 /* 2034 /*