---

yaml --- r: 90724 b: refs/heads/master c: a198d3a h: refs/heads/master v: v3
git-mirror · Apr 15, 2008 · 6ba15f8 · 6ba15f8
1 parent 3a385f4
commit 6ba15f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 990098068fe963f956c14f681bd88d90dcb14584
+refs/heads/master: a198d3a200313bca8261e30e6daaad790937fd7e
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
@@ -1065,7 +1065,9 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 	/* Loop around if more data is required */
 
 	if ((sz_copied < buf_len)    /* didn't get all requested data */
-	    && (flags & MSG_WAITALL) /* ... and need to wait for more */
+	    && (!skb_queue_empty(&sock->sk->sk_receive_queue) ||
+		(flags & MSG_WAITALL))
+				     /* ... and more is ready or required */
 	    && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */
 	    && (!err)                /* ... and haven't reached a FIN */
 	    )