From 6ba15f8f7aa09972b2e89f6614bac865ea5fdae5 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 15 Apr 2008 00:07:15 -0700 Subject: [PATCH] --- yaml --- r: 90724 b: refs/heads/master c: a198d3a200313bca8261e30e6daaad790937fd7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/socket.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index efb64710f9de..44185730111c 100644 --- 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 index 91aa2dc51771..c1a199c0fa6d 100644 --- 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 */ )