1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 1f21d2a1e528..853db7a08a26 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -166,7 +166,7 @@ static void handle_tx(struct vhost_net *net)
         if (wmem < sock->sk->sk_sndbuf / 2)
                 tx_poll_stop(net);
         hdr_size = vq->vhost_hlen;
-        zcopy = vhost_sock_zcopy(sock);
+        zcopy = vq->ubufs;
 
         for (;;) {
                 /* Release DMAs done buffers first */
@@ -257,7 +257,8 @@ static void handle_tx(struct vhost_net *net)
                                         UIO_MAXIOV;
                         }
                         vhost_discard_vq_desc(vq, 1);
-                        tx_poll_start(net, sock);
+                        if (err == -EAGAIN || err == -ENOBUFS)
+                                tx_poll_start(net, sock);
                         break;
                 }
                 if (err != len)
@@ -265,6 +266,8 @@ static void handle_tx(struct vhost_net *net)
                                  " len %d != %zd\n", err, len);
                 if (!zcopy)
                         vhost_add_used_and_signal(&net->dev, vq, head, 0);
+                else
+                        vhost_zerocopy_signal_used(vq);
                 total_len += len;
                 if (unlikely(total_len >= VHOST_NET_WEIGHT)) {
                         vhost_poll_queue(&vq->poll);