virtio-net rq submits premapped per-buffer by setting sg page to NULL;

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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6f4781ec2b36..630e5b21ad69 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -542,6 +542,13 @@ static struct sk_buff *ptr_to_skb(void *ptr)
        return (struct sk_buff *)((unsigned long)ptr & ~VIRTIO_ORPHAN_FLAG);
 }
 
+static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u32 len)
+{
+       sg_assign_page(sg, NULL);
+       sg->dma_address = addr;
+       sg->length = len;
+}
+
 static void __free_old_xmit(struct send_queue *sq, struct netdev_queue *txq,
                            bool in_napi, struct virtnet_sq_free_stats *stats)
 {
@@ -915,8 +922,7 @@ static void virtnet_rq_init_one_sg(struct receive_queue 
*rq, void *buf, u32 len)
        addr = dma->addr - sizeof(*dma) + offset;
 
        sg_init_table(rq->sg, 1);
-       rq->sg[0].dma_address = addr;
-       rq->sg[0].length = len;
+       sg_fill_dma(&rq->sg[0], addr, len);
 }
 
 static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp)
@@ -1068,12 +1074,6 @@ static void check_sq_full_and_disable(struct 
virtnet_info *vi,
        }
 }
 
-static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u32 len)
-{
-       sg->dma_address = addr;
-       sg->length = len;
-}
-
 static struct xdp_buff *buf_to_xdp(struct virtnet_info *vi,
                                   struct receive_queue *rq, void *buf, u32 len)
 {
-- 
2.32.0.3.g01195cf9f


Reply via email to