Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dc7b9e4 authored by Rusty Russell's avatar Rusty Russell
Browse files

virtio_net: use simplified virtqueue accessors. 



We never add buffers with input and output parts, so use the new accessors.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Reviewed-by: default avatarAsias He <asias@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent f7bc9594

drivers/net/virtio_net.c

+5 −6
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int add_recvbuf_small(struct receive_queue *rq, gfp_t gfp) 


	skb_to_sgvec(skb, rq->sg + 1, 0, skb->len);



	err = virtqueue_add_buf(rq->vq, rq->sg, 0, 2, skb, gfp);

	err = virtqueue_add_inbuf(rq->vq, rq->sg, 2, skb, gfp);

	if (err < 0)

		dev_kfree_skb(skb);
@@ -488,7 +488,7 @@ static int add_recvbuf_big(struct receive_queue *rq, gfp_t gfp) 


	/* chain first in list head */

	first->private = (unsigned long)list;

	err = virtqueue_add_buf(rq->vq, rq->sg, 0, MAX_SKB_FRAGS + 2,

	err = virtqueue_add_inbuf(rq->vq, rq->sg, MAX_SKB_FRAGS + 2,

				  first, gfp);

	if (err < 0)

		give_pages(rq, first);
@@ -507,7 +507,7 @@ static int add_recvbuf_mergeable(struct receive_queue *rq, gfp_t gfp) 


	sg_init_one(rq->sg, page_address(page), PAGE_SIZE);



	err = virtqueue_add_buf(rq->vq, rq->sg, 0, 1, page, gfp);

	err = virtqueue_add_inbuf(rq->vq, rq->sg, 1, page, gfp);

	if (err < 0)

		give_pages(rq, page);
@@ -710,8 +710,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) 
		sg_set_buf(sq->sg, &hdr->hdr, sizeof hdr->hdr);



	num_sg = skb_to_sgvec(skb, sq->sg + 1, 0, skb->len) + 1;

	return virtqueue_add_buf(sq->vq, sq->sg, num_sg,

				 0, skb, GFP_ATOMIC);

	return virtqueue_add_outbuf(sq->vq, sq->sg, num_sg, skb, GFP_ATOMIC);

}



static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)