[PATCH 2/3] Revert "virtio_net: big mode skip the unmap check"

[Xuan Zhuo]

This reverts commit a377ae542d8d0a20a3173da3bbba72e045bea7a9.

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
---
 drivers/net/virtio_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 36a7781979b7..b68e64e8c7b6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1008,7 +1008,7 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue 
*vq, void *buf)
                return;
        }
 
-       if (!vi->big_packets || vi->mergeable_rx_bufs)
+       if (rq->do_dma)
                virtnet_rq_unmap(rq, buf, 0);
 
        virtnet_rq_free_buf(vi, rq, buf);
@@ -2718,7 +2718,7 @@ static int virtnet_receive_packets(struct virtnet_info 
*vi,
                }
        } else {
                while (packets < budget &&
-                      (buf = virtqueue_get_buf(rq->vq, &len)) != NULL) {
+                      (buf = virtnet_rq_get_buf(rq, &len, NULL)) != NULL) {
                        receive_buf(vi, rq, buf, len, NULL, xdp_xmit, stats);
                        packets++;
                }
-- 
2.32.0.3.g01195cf9f