diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /drivers/net/davinci_emac.c | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 7018bfe408a4..082d6ea69920 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
| @@ -1730,7 +1730,7 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev) | |||
| 1730 | emac_read(EMAC_TXCARRIERSENSE); | 1730 | emac_read(EMAC_TXCARRIERSENSE); |
| 1731 | emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask); | 1731 | emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask); |
| 1732 | 1732 | ||
| 1733 | ndev->stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN); | 1733 | ndev->stats.tx_fifo_errors += emac_read(EMAC_TXUNDERRUN); |
| 1734 | emac_write(EMAC_TXUNDERRUN, stats_clear_mask); | 1734 | emac_write(EMAC_TXUNDERRUN, stats_clear_mask); |
| 1735 | 1735 | ||
| 1736 | return &ndev->stats; | 1736 | return &ndev->stats; |