|
@@ -845,7 +845,9 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
|
|
|
ssize_t ret = 0;
|
|
|
|
|
|
while (len) {
|
|
|
- prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
|
|
|
+ if (!noblock)
|
|
|
+ prepare_to_wait(sk_sleep(&q->sk), &wait,
|
|
|
+ TASK_INTERRUPTIBLE);
|
|
|
|
|
|
/* Read frames from the queue */
|
|
|
skb = skb_dequeue(&q->sk.sk_receive_queue);
|
|
@@ -867,7 +869,8 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- finish_wait(sk_sleep(&q->sk), &wait);
|
|
|
+ if (!noblock)
|
|
|
+ finish_wait(sk_sleep(&q->sk), &wait);
|
|
|
return ret;
|
|
|
}
|
|
|
|