aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/acenic.c')
-rw-r--r--drivers/net/acenic.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 6c192650d349..e4483de84e7f 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1457,11 +1457,6 @@ static int __devinit ace_init(struct net_device *dev)
1457 ace_set_txprd(regs, ap, 0); 1457 ace_set_txprd(regs, ap, 0);
1458 writel(0, &regs->RxRetCsm); 1458 writel(0, &regs->RxRetCsm);
1459 1459
1460 /*
1461 * Zero the stats before starting the interface
1462 */
1463 memset(&ap->stats, 0, sizeof(ap->stats));
1464
1465 /* 1460 /*
1466 * Enable DMA engine now. 1461 * Enable DMA engine now.
1467 * If we do this sooner, Mckinley box pukes. 1462 * If we do this sooner, Mckinley box pukes.
@@ -2041,8 +2036,8 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
2041 netif_rx(skb); 2036 netif_rx(skb);
2042 2037
2043 dev->last_rx = jiffies; 2038 dev->last_rx = jiffies;
2044 ap->stats.rx_packets++; 2039 dev->stats.rx_packets++;
2045 ap->stats.rx_bytes += retdesc->size; 2040 dev->stats.rx_bytes += retdesc->size;
2046 2041
2047 idx = (idx + 1) % RX_RETURN_RING_ENTRIES; 2042 idx = (idx + 1) % RX_RETURN_RING_ENTRIES;
2048 } 2043 }
@@ -2090,8 +2085,8 @@ static inline void ace_tx_int(struct net_device *dev,
2090 } 2085 }
2091 2086
2092 if (skb) { 2087 if (skb) {
2093 ap->stats.tx_packets++; 2088 dev->stats.tx_packets++;
2094 ap->stats.tx_bytes += skb->len; 2089 dev->stats.tx_bytes += skb->len;
2095 dev_kfree_skb_irq(skb); 2090 dev_kfree_skb_irq(skb);
2096 info->skb = NULL; 2091 info->skb = NULL;
2097 } 2092 }
@@ -2863,11 +2858,11 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev)
2863 struct ace_mac_stats __iomem *mac_stats = 2858 struct ace_mac_stats __iomem *mac_stats =
2864 (struct ace_mac_stats __iomem *)ap->regs->Stats; 2859 (struct ace_mac_stats __iomem *)ap->regs->Stats;
2865 2860
2866 ap->stats.rx_missed_errors = readl(&mac_stats->drop_space); 2861 dev->stats.rx_missed_errors = readl(&mac_stats->drop_space);
2867 ap->stats.multicast = readl(&mac_stats->kept_mc); 2862 dev->stats.multicast = readl(&mac_stats->kept_mc);
2868 ap->stats.collisions = readl(&mac_stats->coll); 2863 dev->stats.collisions = readl(&mac_stats->coll);
2869 2864
2870 return &ap->stats; 2865 return &dev->stats;
2871} 2866}
2872 2867
2873 2868