summaryrefslogtreecommitdiff
path: root/drivers/vhost/net.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-19 10:12:44 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-19 10:12:44 -0700
commitfd99beb9375b44309d5ed9c2b62063e23151610b (patch)
tree092e3ee94f5c75ef049729b22813c8faac818f83 /drivers/vhost/net.c
parent3fbcf6bb55686c36086c8ab15fe9ee5a63eb79d4 (diff)
parentb834226b04d6fb51178a64e98872856986c71474 (diff)
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r--drivers/vhost/net.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index f0fd52cdfadc..70ac60437d17 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -703,6 +703,10 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
vhost_net_disable_vq(n, vq);
rcu_assign_pointer(vq->private_data, sock);
vhost_net_enable_vq(n, vq);
+
+ r = vhost_init_used(vq);
+ if (r)
+ goto err_vq;
}
mutex_unlock(&vq->mutex);