UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: sunbmac: Use net_device_stats from struct net_device 

Instead of using a private copy of struct net_device_stats in struct
bigmac, use stats from struct net_device.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Klauser 2017-04-07 10:17:34 +02:00 committed by David S. Miller
parent b09a9537c9
commit 0ffa9373a0
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/sun/sunbmac.c
View File

@ -169,7 +169,7 @@ static void bigmac_stop(struct bigmac *bp)
static void bigmac_get_counters(struct bigmac *bp, void __iomem *bregs) static void bigmac_get_counters(struct bigmac *bp, void __iomem *bregs)
{ {
struct net_device_stats *stats = &bp->enet_stats; struct net_device_stats *stats = &bp->dev->stats;
stats->rx_crc_errors += sbus_readl(bregs + BMAC_RCRCECTR); stats->rx_crc_errors += sbus_readl(bregs + BMAC_RCRCECTR);
sbus_writel(0, bregs + BMAC_RCRCECTR); sbus_writel(0, bregs + BMAC_RCRCECTR);
@ -774,8 +774,8 @@ static void bigmac_tx(struct bigmac *bp)
if (this->tx_flags & TXD_OWN) if (this->tx_flags & TXD_OWN)
break; break;
skb = bp->tx_skbs[elem]; skb = bp->tx_skbs[elem];
bp->enet_stats.tx_packets++; dev->stats.tx_packets++;
bp->enet_stats.tx_bytes += skb->len; dev->stats.tx_bytes += skb->len;
dma_unmap_single(&bp->bigmac_op->dev, dma_unmap_single(&bp->bigmac_op->dev,
this->tx_addr, skb->len, this->tx_addr, skb->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
@ -811,12 +811,12 @@ static void bigmac_rx(struct bigmac *bp)
/* Check for errors. */ /* Check for errors. */
if (len < ETH_ZLEN) { if (len < ETH_ZLEN) {
bp->enet_stats.rx_errors++; bp->dev->stats.rx_errors++;
bp->enet_stats.rx_length_errors++; bp->dev->stats.rx_length_errors++;
drop_it: drop_it:
/* Return it to the BigMAC. */ /* Return it to the BigMAC. */
bp->enet_stats.rx_dropped++; bp->dev->stats.rx_dropped++;
this->rx_flags = this->rx_flags =
(RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH)); (RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH));
goto next; goto next;
@ -875,8 +875,8 @@ static void bigmac_rx(struct bigmac *bp)
/* No checksums done by the BigMAC ;-( */ /* No checksums done by the BigMAC ;-( */
skb->protocol = eth_type_trans(skb, bp->dev); skb->protocol = eth_type_trans(skb, bp->dev);
netif_rx(skb); netif_rx(skb);
bp->enet_stats.rx_packets++; bp->dev->stats.rx_packets++;
bp->enet_stats.rx_bytes += len; bp->dev->stats.rx_bytes += len;
next: next:
elem = NEXT_RX(elem); elem = NEXT_RX(elem);
this = &rxbase[elem]; this = &rxbase[elem];
@ -987,7 +987,7 @@ static struct net_device_stats *bigmac_get_stats(struct net_device *dev)
struct bigmac *bp = netdev_priv(dev); struct bigmac *bp = netdev_priv(dev);
bigmac_get_counters(bp, bp->bregs); bigmac_get_counters(bp, bp->bregs);
return &bp->enet_stats; return &dev->stats;
} }
static void bigmac_set_multicast(struct net_device *dev) static void bigmac_set_multicast(struct net_device *dev)

1
drivers/net/ethernet/sun/sunbmac.h
View File

@ -311,7 +311,6 @@ struct bigmac {
enum bigmac_timer_state timer_state; enum bigmac_timer_state timer_state;
unsigned int timer_ticks; unsigned int timer_ticks;
struct net_device_stats enet_stats;
struct platform_device *qec_op; struct platform_device *qec_op;
struct platform_device *bigmac_op; struct platform_device *bigmac_op;
struct net_device *dev; struct net_device *dev;