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

Commit 7def171d authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: r6040: Increase statistics upon transmit completion 



r6040_xmit() is increasing transmit statistics during transmission while
this may still fail, do this in r6040_tx() where we complete transmitted
buffers instead.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3eb415d1

drivers/net/ethernet/rdc/r6040.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -614,6 +614,11 @@ static void r6040_tx(struct net_device *dev) 
		if (descptr->status & DSC_OWNER_MAC)

		if (descptr->status & DSC_OWNER_MAC)

			break; /* Not complete */

			break; /* Not complete */

		skb_ptr = descptr->skb_ptr;

		skb_ptr = descptr->skb_ptr;



		/* Statistic Counter */

		dev->stats.tx_packets++;

		dev->stats.tx_bytes += skb_ptr->len;



		pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),

		pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),

			skb_ptr->len, PCI_DMA_TODEVICE);

			skb_ptr->len, PCI_DMA_TODEVICE);

		/* Free buffer */

		/* Free buffer */
@@ -821,9 +826,6 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, 
		return NETDEV_TX_BUSY;

		return NETDEV_TX_BUSY;

	}

	}





	/* Statistic Counter */

	dev->stats.tx_packets++;

	dev->stats.tx_bytes += skb->len;

	/* Set TX descriptor & Transmit it */

	/* Set TX descriptor & Transmit it */

	lp->tx_free_desc--;

	lp->tx_free_desc--;

	descptr = lp->tx_insert_ptr;

	descptr = lp->tx_insert_ptr;