From 7cc10a3736dbc32c0dc530f01fe7f911ceb38fbf Mon Sep 17 00:00:00 2001
From: Octavian Purdila <opurdila@ixiacom.com>
Date: Thu, 3 Jul 2008 03:31:21 -0700
Subject: [PATCH] --- yaml --- r: 98758 b: refs/heads/master c:
 374e7b59498ce0785b3727794b351221528a5159 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b804e7d073c0..07190448dcfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b23b4a7acd9b37a269c62d02479d4f645dd20a
+refs/heads/master: 374e7b59498ce0785b3727794b351221528a5159
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index de53024664e4..1d723de18686 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1209,7 +1209,8 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
 		return -ENOTCONN;
 	while ((skb = tcp_recv_skb(sk, seq, &offset)) != NULL) {
 		if (offset < skb->len) {
-			size_t used, len;
+			int used;
+			size_t len;
 
 			len = skb->len - offset;
 			/* Stop reading if we hit a patch of urgent data */