Merge tag 'char-misc-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux.git] / drivers / vhost / net.c

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index d57ebdd616d95e37b5509410fd9ff18b0d7ad7d2..1a2dd53caadea8388dc5fd89e2c70d66296a2f1d 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -35,7 +35,7 @@
 
 #include "vhost.h"
 
-static int experimental_zcopytx = 1;
+static int experimental_zcopytx = 0;
 module_param(experimental_zcopytx, int, 0444);
 MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;"
                                       " 1 -Enable; 0 - Disable");
@@ -956,7 +956,7 @@ static void handle_tx(struct vhost_net *net)
        if (!sock)
                goto out;
 
-       if (!vq_iotlb_prefetch(vq))
+       if (!vq_meta_prefetch(vq))
                goto out;
 
        vhost_disable_notify(&net->dev, vq);
@@ -1125,7 +1125,7 @@ static void handle_rx(struct vhost_net *net)
        if (!sock)
                goto out;
 
-       if (!vq_iotlb_prefetch(vq))
+       if (!vq_meta_prefetch(vq))
                goto out;
 
        vhost_disable_notify(&net->dev, vq);