diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 13:45:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 13:45:59 +0200 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /net/ipv4/tcp.c | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 850825dc86e..1d723de1868 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 */ |