---

yaml --- r: 98758 b: refs/heads/master c: 374e7b5 h: refs/heads/master v: v3
git-mirror · Jul 3, 2008 · 7cc10a3 · 7cc10a3
1 parent abfc084
commit 7cc10a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 */