---

yaml --- r: 103521 b: refs/heads/master c: 8642bd9 h: refs/heads/master i: 103519: d32b69c v: v3
git-mirror · Jul 15, 2008 · 91b3e61 · 91b3e61
1 parent b610177
commit 91b3e61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */