diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index 717a5f1c8792..72da57d6ab7b 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) | |||
209 | * specified. Zero is returned for a success. | 209 | * specified. Zero is returned for a success. |
210 | */ | 210 | */ |
211 | 211 | ||
212 | int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, | 212 | static int move_addr_to_user(struct sockaddr *kaddr, int klen, |
213 | int __user *ulen) | 213 | void __user *uaddr, int __user *ulen) |
214 | { | 214 | { |
215 | int err; | 215 | int err; |
216 | int len; | 216 | int len; |
@@ -661,7 +661,8 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, | |||
661 | } | 661 | } |
662 | EXPORT_SYMBOL_GPL(__sock_recv_timestamp); | 662 | EXPORT_SYMBOL_GPL(__sock_recv_timestamp); |
663 | 663 | ||
664 | inline void sock_recv_drops(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) | 664 | static inline void sock_recv_drops(struct msghdr *msg, struct sock *sk, |
665 | struct sk_buff *skb) | ||
665 | { | 666 | { |
666 | if (sock_flag(sk, SOCK_RXQ_OVFL) && skb && skb->dropcount) | 667 | if (sock_flag(sk, SOCK_RXQ_OVFL) && skb && skb->dropcount) |
667 | put_cmsg(msg, SOL_SOCKET, SO_RXQ_OVFL, | 668 | put_cmsg(msg, SOL_SOCKET, SO_RXQ_OVFL, |