From 40e8479cb7090d396fcf54a950aa2cfa5f05af54 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 27 Sep 2010 20:24:54 -0700
Subject: [PATCH] --- yaml --- r: 211130 b: refs/heads/master c:
 01db403cf99f739f86903314a489fb420e0e254f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/socket.h | 2 +-
 trunk/net/core/iovec.c       | 5 +++--
 trunk/net/ipv4/tcp.c         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 774304f6cf60..2ba20ffefce6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b20406cda621c2495d10baab1e87127ceb43337
+refs/heads/master: 01db403cf99f739f86903314a489fb420e0e254f
diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
index a2fada9becb6..a8f56e1ec760 100644
--- a/trunk/include/linux/socket.h
+++ b/trunk/include/linux/socket.h
@@ -322,7 +322,7 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
 					  int offset, 
 					  unsigned int len, __wsum *csump);
 
-extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
+extern long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
 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);
diff --git a/trunk/net/core/iovec.c b/trunk/net/core/iovec.c
index 1cd98df412df..e6b133b77ccb 100644
--- a/trunk/net/core/iovec.c
+++ b/trunk/net/core/iovec.c
@@ -35,9 +35,10 @@
  *	in any case.
  */
 
-int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
+long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
 {
-	int size, err, ct;
+	int size, ct;
+	long err;
 
 	if (m->msg_namelen) {
 		if (mode == VERIFY_READ) {
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 95d75d443927..f115ea68a4ef 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -943,7 +943,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	sg = sk->sk_route_caps & NETIF_F_SG;
 
 	while (--iovlen >= 0) {
-		int seglen = iov->iov_len;
+		size_t seglen = iov->iov_len;
 		unsigned char __user *from = iov->iov_base;
 
 		iov++;