X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Ftcp.c;h=1d723de18686a9ff80bb82876fac7a1ee7fb013e;hb=d18bb9a548e550f3ced57618e75085fb3f173133;hp=850825dc86e6dc55ea72ce8b669c4bf16f3ee876;hpb=b2a4a7ce3a995b83f59792ec9981d20ac550ccb0;p=linux-2.6

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 850825dc86..1d723de186 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -255,6 +255,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/skbuff.h>
+#include <linux/scatterlist.h>
 #include <linux/splice.h>
 #include <linux/net.h>
 #include <linux/socket.h>
@@ -1208,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 */