diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
| commit | 4b28d81a7ed82b906f1fdec0133d597b9cf57f85 (patch) | |
| tree | fc722c2bafb704c0db35599392d8f8dddbb4e36d /drivers/vhost/net.c | |
| parent | 114df7d66efd5c23561782f38e97c48fb30d4f5d (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
| download | talos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.tar.gz talos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.zip | |
Merge remote branch 'gpio/ep93xx-dma' into next
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 2f7c76a85e53..e224a92baa16 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -144,7 +144,7 @@ static void handle_tx(struct vhost_net *net) } mutex_lock(&vq->mutex); - vhost_disable_notify(vq); + vhost_disable_notify(&net->dev, vq); if (wmem < sock->sk->sk_sndbuf / 2) tx_poll_stop(net); @@ -166,8 +166,8 @@ static void handle_tx(struct vhost_net *net) set_bit(SOCK_ASYNC_NOSPACE, &sock->flags); break; } - if (unlikely(vhost_enable_notify(vq))) { - vhost_disable_notify(vq); + if (unlikely(vhost_enable_notify(&net->dev, vq))) { + vhost_disable_notify(&net->dev, vq); continue; } break; @@ -315,7 +315,7 @@ static void handle_rx(struct vhost_net *net) return; mutex_lock(&vq->mutex); - vhost_disable_notify(vq); + vhost_disable_notify(&net->dev, vq); vhost_hlen = vq->vhost_hlen; sock_hlen = vq->sock_hlen; @@ -334,10 +334,10 @@ static void handle_rx(struct vhost_net *net) break; /* OK, now we need to know about added descriptors. */ if (!headcount) { - if (unlikely(vhost_enable_notify(vq))) { + if (unlikely(vhost_enable_notify(&net->dev, vq))) { /* They have slipped one in as we were * doing that: check again. */ - vhost_disable_notify(vq); + vhost_disable_notify(&net->dev, vq); continue; } /* Nothing new? Wait for eventfd to tell us |
