diff options
| author | Wolfgang Grandegger <wg@grandegger.com> | 2009-09-01 05:29:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 02:16:15 -0700 |
| commit | 8935f57e68c40c6469efe03f996bfb6150e18c6b (patch) | |
| tree | 2e9467085839fff453d7760bf2623bb2a4a02117 /drivers/net | |
| parent | 39e3ab6fded4d7e66e01a878f0cae23ddd480c3b (diff) | |
| download | op-kernel-dev-8935f57e68c40c6469efe03f996bfb6150e18c6b.zip op-kernel-dev-8935f57e68c40c6469efe03f996bfb6150e18c6b.tar.gz | |
can: sja1000: fix network statistics update
The member "tx_bytes" of "struct net_device_stats" should be
incremented when the interrupt is done and an "arbitration
lost error" is a TX error and the statistics should be updated
accordingly.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index fd7fa71..16d2ecd 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -242,7 +242,6 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct sja1000_priv *priv = netdev_priv(dev); - struct net_device_stats *stats = &dev->stats; struct can_frame *cf = (struct can_frame *)skb->data; uint8_t fi; uint8_t dlc; @@ -276,7 +275,6 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb, for (i = 0; i < dlc; i++) priv->write_reg(priv, dreg++, cf->data[i]); - stats->tx_bytes += dlc; dev->trans_start = jiffies; can_put_echo_skb(skb, dev, 0); @@ -427,7 +425,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) dev_dbg(dev->dev.parent, "arbitration lost interrupt\n"); alc = priv->read_reg(priv, REG_ALC); priv->can.can_stats.arbitration_lost++; - stats->rx_errors++; + stats->tx_errors++; cf->can_id |= CAN_ERR_LOSTARB; cf->data[0] = alc & 0x1f; } @@ -484,6 +482,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id) if (isrc & IRQ_TI) { /* transmission complete interrupt */ + stats->tx_bytes += priv->read_reg(priv, REG_FI) & 0xf; stats->tx_packets++; can_get_echo_skb(dev, 0); netif_wake_queue(dev); |
