aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-10-18 14:27:29 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-21 03:09:42 -0700
commit11165f1457181e4499e5eada442434a07827ffd8 (patch)
treea681641ba47d5b10a928e89b8ee30acd1b2fa332
parent7e12bb0adb5b3114a73098d3536b3c45635e6c95 (diff)
downloadkernel_samsung_smdk4412-11165f1457181e4499e5eada442434a07827ffd8.zip
kernel_samsung_smdk4412-11165f1457181e4499e5eada442434a07827ffd8.tar.gz
kernel_samsung_smdk4412-11165f1457181e4499e5eada442434a07827ffd8.tar.bz2
socket: localize functions
A couple of functions in socket.c are only used there and should be localized. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/socket.h1
-rw-r--r--net/socket.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index a8f56e1..5146b50 100644
--- a/include/linux/socket.h
+++ b/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/net/socket.c b/net/socket.c
index 717a5f1..72da57d 100644
--- a/net/socket.c
+++ b/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,