diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-25 18:20:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-26 14:18:45 -0400 |
commit | 4a4771a58e13b46bfdc999fe481e550f8c6937ff (patch) | |
tree | 42bb025b051ba79efda403e1b843c2a9a1243946 /drivers/net/macvtap.c | |
parent | be9e969d79e40c59142fa9e931aa6f085581b379 (diff) |
net: use sk_sleep()
Commit aa395145 (net: sk_sleep() helper) missed three files in the
conversion.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvtap.c')
-rw-r--r-- | drivers/net/macvtap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 85d6420f8404..d97e1fd234ba 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -181,7 +181,7 @@ static int macvtap_forward(struct net_device *dev, struct sk_buff *skb) | |||
181 | return -ENOLINK; | 181 | return -ENOLINK; |
182 | 182 | ||
183 | skb_queue_tail(&q->sk.sk_receive_queue, skb); | 183 | skb_queue_tail(&q->sk.sk_receive_queue, skb); |
184 | wake_up_interruptible_poll(q->sk.sk_sleep, POLLIN | POLLRDNORM | POLLRDBAND); | 184 | wake_up_interruptible_poll(sk_sleep(&q->sk), POLLIN | POLLRDNORM | POLLRDBAND); |
185 | return 0; | 185 | return 0; |
186 | } | 186 | } |
187 | 187 | ||
@@ -562,7 +562,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, | |||
562 | struct sk_buff *skb; | 562 | struct sk_buff *skb; |
563 | ssize_t ret = 0; | 563 | ssize_t ret = 0; |
564 | 564 | ||
565 | add_wait_queue(q->sk.sk_sleep, &wait); | 565 | add_wait_queue(sk_sleep(&q->sk), &wait); |
566 | while (len) { | 566 | while (len) { |
567 | current->state = TASK_INTERRUPTIBLE; | 567 | current->state = TASK_INTERRUPTIBLE; |
568 | 568 | ||
@@ -587,7 +587,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, | |||
587 | } | 587 | } |
588 | 588 | ||
589 | current->state = TASK_RUNNING; | 589 | current->state = TASK_RUNNING; |
590 | remove_wait_queue(q->sk.sk_sleep, &wait); | 590 | remove_wait_queue(sk_sleep(&q->sk), &wait); |
591 | return ret; | 591 | return ret; |
592 | } | 592 | } |
593 | 593 | ||