summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2004-01-08 09:49:00 -0800
committerStephen Hemminger <shemminger@osdl.org>2004-01-08 09:49:00 -0800
commita7984945cbe59d2ca7ce2800a73e2d67b3444cac (patch)
tree57870bb68e9b77fd6b2f4e2e822901009b9583de /net
parent79d434c124a19852558e23a30d219c83c9a05eb2 (diff)
[NET]: Use size_t for size argument in {send,recv}msg callchain.
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c4
-rw-r--r--net/socket.c13
2 files changed, 10 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index d549d519482d..27dfe373e59f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -966,13 +966,13 @@ int sock_no_getsockopt(struct socket *sock, int level, int optname,
}
int sock_no_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
- int flags)
+ size_t len)
{
return -EOPNOTSUPP;
}
int sock_no_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
- int len, int flags)
+ size_t len, int flags)
{
return -EOPNOTSUPP;
}
diff --git a/net/socket.c b/net/socket.c
index bafabac1f891..3503ca7a6c20 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -523,7 +523,8 @@ void sock_release(struct socket *sock)
sock->file=NULL;
}
-static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, int size)
+static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
+ struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
int err;
@@ -540,7 +541,7 @@ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct
return sock->ops->sendmsg(iocb, sock, msg, size);
}
-int sock_sendmsg(struct socket *sock, struct msghdr *msg, int size)
+int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
{
struct kiocb iocb;
int ret;
@@ -553,7 +554,8 @@ int sock_sendmsg(struct socket *sock, struct msghdr *msg, int size)
}
-static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, int size, int flags)
+static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+ struct msghdr *msg, size_t size, int flags)
{
int err;
struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -571,7 +573,8 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct
return sock->ops->recvmsg(iocb, sock, msg, size, flags);
}
-int sock_recvmsg(struct socket *sock, struct msghdr *msg, int size, int flags)
+int sock_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t size, int flags)
{
struct kiocb iocb;
int ret;
@@ -668,7 +671,7 @@ ssize_t sock_sendpage(struct file *file, struct page *page,
}
int sock_readv_writev(int type, struct inode * inode, struct file * file,
- const struct iovec * iov, long count, long size)
+ const struct iovec * iov, long count, size_t size)
{
struct msghdr msg;
struct socket *sock;