From cd9aefb1d91f3b43cff6c074d6431d093972fb0f Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 10 Jan 2013 07:06:10 +0000 Subject: [PATCH] --- yaml --- r: 348615 b: refs/heads/master c: ff905b1e4aad8ccbbb0d42f7137f19482742ff07 h: refs/heads/master i: 348613: d9e6d78a1d7a36cc4fdba75c5a89f745ad59cb4e 348611: d3839d63fa5db0b33c85b2d67d6ea40e852054ba 348607: 85c51f5d5f3d03c015b411661091fa11a5cd220a v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8204a2d46d06..3317e974f508 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae +refs/heads/master: ff905b1e4aad8ccbbb0d42f7137f19482742ff07 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 1ca253635f7a..5f173dccd1e9 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -1482,7 +1482,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, break; } used = recv_actor(desc, skb, offset, len); - if (used < 0) { + if (used <= 0) { if (!copied) copied = used; break;