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;