Commit 5da7137d authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

virtio_net: rename free_old_xmit_skbs to free_old_xmit 



Since free_old_xmit_skbs not only deals with skb, but also xdp frame and
subsequent added xsk, so change the name of this function to
free_old_xmit.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20240229072044.77388-19-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent b1dc24ab

drivers/net/virtio_net.c

+5 −5
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf) 
	virtnet_rq_free_buf(vi, rq, buf);

}



static void free_old_xmit_skbs(struct send_queue *sq, bool in_napi)

static void free_old_xmit(struct send_queue *sq, bool in_napi)

{

	struct virtnet_sq_free_stats stats = {0};
@@ -880,7 +880,7 @@ static void check_sq_full_and_disable(struct virtnet_info *vi, 
				virtqueue_napi_schedule(&sq->napi, sq->vq);

		} else if (unlikely(!virtqueue_enable_cb_delayed(sq->vq))) {

			/* More just got used, free them then recheck. */

			free_old_xmit_skbs(sq, false);

			free_old_xmit(sq, false);

			if (sq->vq->num_free >= 2+MAX_SKB_FRAGS) {

				netif_start_subqueue(dev, qnum);

				virtqueue_disable_cb(sq->vq);
@@ -2176,7 +2176,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) 


		do {

			virtqueue_disable_cb(sq->vq);

			free_old_xmit_skbs(sq, true);

			free_old_xmit(sq, true);

		} while (unlikely(!virtqueue_enable_cb_delayed(sq->vq)));



		if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
@@ -2324,7 +2324,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) 
	txq = netdev_get_tx_queue(vi->dev, index);

	__netif_tx_lock(txq, raw_smp_processor_id());

	virtqueue_disable_cb(sq->vq);

	free_old_xmit_skbs(sq, true);

	free_old_xmit(sq, true);



	if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)

		netif_tx_wake_queue(txq);
@@ -2414,7 +2414,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (use_napi)

			virtqueue_disable_cb(sq->vq);



		free_old_xmit_skbs(sq, false);

		free_old_xmit(sq, false);



	} while (use_napi && kick &&

	       unlikely(!virtqueue_enable_cb_delayed(sq->vq)));