acenic: use netstats in net_device structure
Use net_device_stats from net_device structure instead of local. No need to memset it to 0, because it is allocated by kzalloc. Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
de0561c435
commit
966e37bca6
|
@ -1457,11 +1457,6 @@ static int __devinit ace_init(struct net_device *dev)
|
||||||
ace_set_txprd(regs, ap, 0);
|
ace_set_txprd(regs, ap, 0);
|
||||||
writel(0, ®s->RxRetCsm);
|
writel(0, ®s->RxRetCsm);
|
||||||
|
|
||||||
/*
|
|
||||||
* Zero the stats before starting the interface
|
|
||||||
*/
|
|
||||||
memset(&ap->stats, 0, sizeof(ap->stats));
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enable DMA engine now.
|
* Enable DMA engine now.
|
||||||
* If we do this sooner, Mckinley box pukes.
|
* 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)
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
dev->last_rx = jiffies;
|
||||||
ap->stats.rx_packets++;
|
dev->stats.rx_packets++;
|
||||||
ap->stats.rx_bytes += retdesc->size;
|
dev->stats.rx_bytes += retdesc->size;
|
||||||
|
|
||||||
idx = (idx + 1) % RX_RETURN_RING_ENTRIES;
|
idx = (idx + 1) % RX_RETURN_RING_ENTRIES;
|
||||||
}
|
}
|
||||||
|
@ -2090,8 +2085,8 @@ static inline void ace_tx_int(struct net_device *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (skb) {
|
if (skb) {
|
||||||
ap->stats.tx_packets++;
|
dev->stats.tx_packets++;
|
||||||
ap->stats.tx_bytes += skb->len;
|
dev->stats.tx_bytes += skb->len;
|
||||||
dev_kfree_skb_irq(skb);
|
dev_kfree_skb_irq(skb);
|
||||||
info->skb = NULL;
|
info->skb = NULL;
|
||||||
}
|
}
|
||||||
|
@ -2863,11 +2858,11 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev)
|
||||||
struct ace_mac_stats __iomem *mac_stats =
|
struct ace_mac_stats __iomem *mac_stats =
|
||||||
(struct ace_mac_stats __iomem *)ap->regs->Stats;
|
(struct ace_mac_stats __iomem *)ap->regs->Stats;
|
||||||
|
|
||||||
ap->stats.rx_missed_errors = readl(&mac_stats->drop_space);
|
dev->stats.rx_missed_errors = readl(&mac_stats->drop_space);
|
||||||
ap->stats.multicast = readl(&mac_stats->kept_mc);
|
dev->stats.multicast = readl(&mac_stats->kept_mc);
|
||||||
ap->stats.collisions = readl(&mac_stats->coll);
|
dev->stats.collisions = readl(&mac_stats->coll);
|
||||||
|
|
||||||
return &ap->stats;
|
return &dev->stats;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -693,7 +693,6 @@ struct ace_private
|
||||||
__attribute__ ((aligned (SMP_CACHE_BYTES)));
|
__attribute__ ((aligned (SMP_CACHE_BYTES)));
|
||||||
u32 last_tx, last_std_rx, last_mini_rx;
|
u32 last_tx, last_std_rx, last_mini_rx;
|
||||||
#endif
|
#endif
|
||||||
struct net_device_stats stats;
|
|
||||||
int pci_using_dac;
|
int pci_using_dac;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue