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

Commit e19d2dda authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: mvneta: Clean mvneta_tx() sk_buff handling 



Rework mvneta_tx() so that the code that performs the final handling
before a sk_buff is transmitted is done only if the numbers of fragments
processed if positive.

This is preparation work to add the support for software TSO.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01ef26ca

drivers/net/ethernet/marvell/mvneta.c

+7 −8
Original line number Diff line number Diff line
@@ -1584,7 +1584,6 @@ static int mvneta_tx(struct sk_buff *skb, struct net_device *dev) 
	u16 txq_id = skb_get_queue_mapping(skb);

	struct mvneta_tx_queue *txq = &pp->txqs[txq_id];

	struct mvneta_tx_desc *tx_desc;

	struct netdev_queue *nq;

	int frags = 0;

	u32 tx_cmd;
@@ -1592,7 +1591,6 @@ static int mvneta_tx(struct sk_buff *skb, struct net_device *dev) 
		goto out;



	frags = skb_shinfo(skb)->nr_frags + 1;

	nq    = netdev_get_tx_queue(dev, txq_id);



	/* Get a descriptor for the first part of the packet */

	tx_desc = mvneta_txq_next_desc_get(txq);
@@ -1635,16 +1633,17 @@ static int mvneta_tx(struct sk_buff *skb, struct net_device *dev) 
		}

	}



out:

	if (frags > 0) {

		struct mvneta_pcpu_stats *stats = this_cpu_ptr(pp->stats);

		struct netdev_queue *nq = netdev_get_tx_queue(dev, txq_id);



		txq->count += frags;

		mvneta_txq_pend_desc_add(pp, txq, frags);



		if (txq->size - txq->count < MAX_SKB_FRAGS + 1)

			netif_tx_stop_queue(nq);



out:

	if (frags > 0) {

		struct mvneta_pcpu_stats *stats = this_cpu_ptr(pp->stats);



		u64_stats_update_begin(&stats->syncp);

		stats->tx_packets++;

		stats->tx_bytes  += skb->len;