From b562285bfdc8afaa7412da338857a2879f0946d1 Mon Sep 17 00:00:00 2001 From: Hong zhi guo Date: Wed, 6 Jun 2012 22:36:27 +0000 Subject: [PATCH] --- yaml --- r: 313911 b: refs/heads/master c: ccf7e72b54253f926a35fdfa0366e0cb9ba72ffd h: refs/heads/master i: 313909: 112d238982298fc61cbce49288e3d8fb3b6f1c85 313907: 16239f14765230b8cefc63fe583fd331f11db98d 313903: d8e8b52e1bb612d638bd2350710b329bf6fdfae6 v: v3 --- [refs] | 2 +- trunk/drivers/net/macvtap.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index aa8f0920bdc1..d2aba34142aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9939c80e9cb51f0da7d6e70838fd6c90248439f +refs/heads/master: ccf7e72b54253f926a35fdfa0366e0cb9ba72ffd diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c index 2ee56de7b0ca..0737bd4d1669 100644 --- a/trunk/drivers/net/macvtap.c +++ b/trunk/drivers/net/macvtap.c @@ -847,13 +847,12 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, const struct iovec *iv, unsigned long len, int noblock) { - DECLARE_WAITQUEUE(wait, current); + DEFINE_WAIT(wait); struct sk_buff *skb; ssize_t ret = 0; - add_wait_queue(sk_sleep(&q->sk), &wait); while (len) { - current->state = TASK_INTERRUPTIBLE; + prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE); /* Read frames from the queue */ skb = skb_dequeue(&q->sk.sk_receive_queue); @@ -875,8 +874,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, break; } - current->state = TASK_RUNNING; - remove_wait_queue(sk_sleep(&q->sk), &wait); + finish_wait(sk_sleep(&q->sk), &wait); return ret; }