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

Commit ea7735d9 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

virtio-net: move free_old_xmit_skbs 



An upcoming patch will call free_old_xmit_skbs indirectly from
virtnet_poll. Move the function above this to avoid having to
introduce a forward declaration.

This is a pure move: no code changes.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b92f1e67

drivers/net/virtio_net.c

+30 −30
Original line number Diff line number Diff line
@@ -1045,6 +1045,36 @@ static int virtnet_receive(struct receive_queue *rq, int budget) 
	return received;

}



static void free_old_xmit_skbs(struct send_queue *sq)

{

	struct sk_buff *skb;

	unsigned int len;

	struct virtnet_info *vi = sq->vq->vdev->priv;

	struct virtnet_stats *stats = this_cpu_ptr(vi->stats);

	unsigned int packets = 0;

	unsigned int bytes = 0;



	while ((skb = virtqueue_get_buf(sq->vq, &len)) != NULL) {

		pr_debug("Sent skb %p\n", skb);



		bytes += skb->len;

		packets++;



		dev_kfree_skb_any(skb);

	}



	/* Avoid overhead when no packets have been processed

	 * happens when called speculatively from start_xmit.

	 */

	if (!packets)

		return;



	u64_stats_update_begin(&stats->tx_syncp);

	stats->tx_bytes += bytes;

	stats->tx_packets += packets;

	u64_stats_update_end(&stats->tx_syncp);

}



static int virtnet_poll(struct napi_struct *napi, int budget)

{

	struct receive_queue *rq =
@@ -1077,36 +1107,6 @@ static int virtnet_open(struct net_device *dev) 
	return 0;

}



static void free_old_xmit_skbs(struct send_queue *sq)

{

	struct sk_buff *skb;

	unsigned int len;

	struct virtnet_info *vi = sq->vq->vdev->priv;

	struct virtnet_stats *stats = this_cpu_ptr(vi->stats);

	unsigned int packets = 0;

	unsigned int bytes = 0;



	while ((skb = virtqueue_get_buf(sq->vq, &len)) != NULL) {

		pr_debug("Sent skb %p\n", skb);



		bytes += skb->len;

		packets++;



		dev_kfree_skb_any(skb);

	}



	/* Avoid overhead when no packets have been processed

	 * happens when called speculatively from start_xmit.

	 */

	if (!packets)

		return;



	u64_stats_update_begin(&stats->tx_syncp);

	stats->tx_bytes += bytes;

	stats->tx_packets += packets;

	u64_stats_update_end(&stats->tx_syncp);

}



static int virtnet_poll_tx(struct napi_struct *napi, int budget)

{

	struct send_queue *sq = container_of(napi, struct send_queue, napi);