From 91b3e610cffb727fc32f793f98fe0a02740e10ba Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Mon, 14 Jul 2008 22:42:51 -0700 Subject: [PATCH] --- yaml --- r: 103521 b: refs/heads/master c: 8642bd9e04f51980b2b6293c66acf7e388c9a6e7 h: refs/heads/master i: 103519: d32b69c596e16ba21aab5c3af5b693216b938da4 v: v3 --- [refs] | 2 +- trunk/net/tipc/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b671f1380b6..18e790b6958f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ea522416b658dedfc9d565b331624a55a6260ad +refs/heads/master: 8642bd9e04f51980b2b6293c66acf7e388c9a6e7 diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c index 9c362c5759ba..ddcb2a753aa6 100644 --- a/trunk/net/tipc/socket.c +++ b/trunk/net/tipc/socket.c @@ -1133,7 +1133,7 @@ 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 */ - && (!skb_queue_empty(&sock->sk->sk_receive_queue) || + && (!skb_queue_empty(&sk->sk_receive_queue) || (flags & MSG_WAITALL)) /* ... and more is ready or required */ && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */