From 673a0efb337e4d3c12e6cab795c8e16ed74f190e Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Mon, 18 Oct 2010 14:27:29 +0000 Subject: [PATCH] --- yaml --- r: 215403 b: refs/heads/master c: 11165f1457181e4499e5eada442434a07827ffd8 h: refs/heads/master i: 215401: 132f002f33760491dcc72bec6f96eb95edff7aaf 215399: cf6c63950021aff93f251e70d0e9d1da51fa2517 v: v3 --- [refs] | 2 +- trunk/include/linux/socket.h | 1 - trunk/net/socket.c | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5309753e46c6..e122c24d3f09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e12bb0adb5b3114a73098d3536b3c45635e6c95 +refs/heads/master: 11165f1457181e4499e5eada442434a07827ffd8 diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h index a8f56e1ec760..5146b50202ce 100644 --- a/trunk/include/linux/socket.h +++ b/trunk/include/linux/socket.h @@ -326,7 +326,6 @@ extern long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *a extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len); extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata, int offset, int len); -extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, int __user *ulen); extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 717a5f1c8792..72da57d6ab7b 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -209,8 +209,8 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr) * specified. Zero is returned for a success. */ -int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, - int __user *ulen) +static int move_addr_to_user(struct sockaddr *kaddr, int klen, + void __user *uaddr, int __user *ulen) { int err; int len; @@ -661,7 +661,8 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, } EXPORT_SYMBOL_GPL(__sock_recv_timestamp); -inline void sock_recv_drops(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) +static inline void sock_recv_drops(struct msghdr *msg, struct sock *sk, + struct sk_buff *skb) { if (sock_flag(sk, SOCK_RXQ_OVFL) && skb && skb->dropcount) put_cmsg(msg, SOL_SOCKET, SO_RXQ_OVFL,