Merge tag 'nios2-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[linux-2.6-microblaze.git] / drivers / net / tap.c

diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 8e01390..dd614c2 100644 (file)
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -520,8 +520,7 @@ static int tap_open(struct inode *inode, struct file *file)
                goto err;
        }
 
-       RCU_INIT_POINTER(q->sock.wq, &q->wq);
-       init_waitqueue_head(&q->wq.wait);
+       init_waitqueue_head(&q->sock.wq.wait);
        q->sock.type = SOCK_RAW;
        q->sock.state = SS_CONNECTED;
        q->sock.file = file;
@@ -579,7 +578,7 @@ static __poll_t tap_poll(struct file *file, poll_table *wait)
                goto out;
 
        mask = 0;
-       poll_wait(file, &q->wq.wait, wait);
+       poll_wait(file, &q->sock.wq.wait, wait);
 
        if (!ptr_ring_empty(&q->ring))
                mask |= EPOLLIN | EPOLLRDNORM;