diff options
Diffstat (limited to 'net/iucv/af_iucv.c')
-rw-r--r-- | net/iucv/af_iucv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 2941ee50393b..42b3be302c57 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
@@ -814,6 +814,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
814 | 814 | ||
815 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); | 815 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); |
816 | 816 | ||
817 | /* receive/dequeue next skb: | ||
818 | * the function understands MSG_PEEK and, thus, does not dequeue skb */ | ||
817 | skb = skb_recv_datagram(sk, flags, noblock, &err); | 819 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
818 | if (!skb) { | 820 | if (!skb) { |
819 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 821 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
@@ -861,9 +863,7 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
861 | iucv_process_message_q(sk); | 863 | iucv_process_message_q(sk); |
862 | spin_unlock_bh(&iucv->message_q.lock); | 864 | spin_unlock_bh(&iucv->message_q.lock); |
863 | } | 865 | } |
864 | 866 | } | |
865 | } else | ||
866 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
867 | 867 | ||
868 | done: | 868 | done: |
869 | return err ? : copied; | 869 | return err ? : copied; |