diff options
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 c66ac83316e8..56a133c61452 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -253,6 +253,7 @@ | |||
253 | #include <linux/init.h> | 253 | #include <linux/init.h> |
254 | #include <linux/fs.h> | 254 | #include <linux/fs.h> |
255 | #include <linux/skbuff.h> | 255 | #include <linux/skbuff.h> |
256 | #include <linux/scatterlist.h> | ||
256 | #include <linux/splice.h> | 257 | #include <linux/splice.h> |
257 | #include <linux/net.h> | 258 | #include <linux/net.h> |
258 | #include <linux/socket.h> | 259 | #include <linux/socket.h> |
@@ -1206,7 +1207,8 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, | |||
1206 | return -ENOTCONN; | 1207 | return -ENOTCONN; |
1207 | while ((skb = tcp_recv_skb(sk, seq, &offset)) != NULL) { | 1208 | while ((skb = tcp_recv_skb(sk, seq, &offset)) != NULL) { |
1208 | if (offset < skb->len) { | 1209 | if (offset < skb->len) { |
1209 | size_t used, len; | 1210 | int used; |
1211 | size_t len; | ||
1210 | 1212 | ||
1211 | len = skb->len - offset; | 1213 | len = skb->len - offset; |
1212 | /* Stop reading if we hit a patch of urgent data */ | 1214 | /* Stop reading if we hit a patch of urgent data */ |