diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2016-07-04 17:36:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-05 03:10:28 -0400 |
commit | 7def171ddc93c504bd91ccb56b802392770621c5 (patch) | |
tree | 6872d152458f4ee92d4be6965f6250bcb4384c2e /drivers/net/ethernet/rdc | |
parent | 3eb415d1afd0ec22d2cba33877da036f83098105 (diff) |
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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rdc')
-rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 12fc7cd67fa7..75776eee36f9 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c | |||
@@ -614,6 +614,11 @@ static void r6040_tx(struct net_device *dev) | |||
614 | if (descptr->status & DSC_OWNER_MAC) | 614 | if (descptr->status & DSC_OWNER_MAC) |
615 | break; /* Not complete */ | 615 | break; /* Not complete */ |
616 | skb_ptr = descptr->skb_ptr; | 616 | skb_ptr = descptr->skb_ptr; |
617 | |||
618 | /* Statistic Counter */ | ||
619 | dev->stats.tx_packets++; | ||
620 | dev->stats.tx_bytes += skb_ptr->len; | ||
621 | |||
617 | pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf), | 622 | pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf), |
618 | skb_ptr->len, PCI_DMA_TODEVICE); | 623 | skb_ptr->len, PCI_DMA_TODEVICE); |
619 | /* Free buffer */ | 624 | /* Free buffer */ |
@@ -821,9 +826,6 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, | |||
821 | return NETDEV_TX_BUSY; | 826 | return NETDEV_TX_BUSY; |
822 | } | 827 | } |
823 | 828 | ||
824 | /* Statistic Counter */ | ||
825 | dev->stats.tx_packets++; | ||
826 | dev->stats.tx_bytes += skb->len; | ||
827 | /* Set TX descriptor & Transmit it */ | 829 | /* Set TX descriptor & Transmit it */ |
828 | lp->tx_free_desc--; | 830 | lp->tx_free_desc--; |
829 | descptr = lp->tx_insert_ptr; | 831 | descptr = lp->tx_insert_ptr; |