Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11165f14 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

socket: localize functions 



A couple of functions in socket.c are only used there and
should be localized.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e12bb0a

include/linux/socket.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

net/socket.c

+4 −3
Original line number Diff line number Diff line
@@ -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,