Skip to content

Commit

Permalink
net: sunbmac: Use net_device_stats from struct net_device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tobias Klauser authored and David S. Miller committed Apr 7, 2017
1 parent b09a953 commit 0ffa937
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
18 changes: 9 additions & 9 deletions drivers/net/ethernet/sun/sunbmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static void bigmac_stop(struct bigmac *bp)

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);
sbus_writel(0, bregs + BMAC_RCRCECTR);
Expand Down Expand Up @@ -774,8 +774,8 @@ static void bigmac_tx(struct bigmac *bp)
if (this->tx_flags & TXD_OWN)
break;
skb = bp->tx_skbs[elem];
bp->enet_stats.tx_packets++;
bp->enet_stats.tx_bytes += skb->len;
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
dma_unmap_single(&bp->bigmac_op->dev,
this->tx_addr, skb->len,
DMA_TO_DEVICE);
Expand Down Expand Up @@ -811,12 +811,12 @@ static void bigmac_rx(struct bigmac *bp)

/* Check for errors. */
if (len < ETH_ZLEN) {
bp->enet_stats.rx_errors++;
bp->enet_stats.rx_length_errors++;
bp->dev->stats.rx_errors++;
bp->dev->stats.rx_length_errors++;

drop_it:
/* Return it to the BigMAC. */
bp->enet_stats.rx_dropped++;
bp->dev->stats.rx_dropped++;
this->rx_flags =
(RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH));
goto next;
Expand Down Expand Up @@ -875,8 +875,8 @@ static void bigmac_rx(struct bigmac *bp)
/* No checksums done by the BigMAC ;-( */
skb->protocol = eth_type_trans(skb, bp->dev);
netif_rx(skb);
bp->enet_stats.rx_packets++;
bp->enet_stats.rx_bytes += len;
bp->dev->stats.rx_packets++;
bp->dev->stats.rx_bytes += len;
next:
elem = NEXT_RX(elem);
this = &rxbase[elem];
Expand Down Expand Up @@ -987,7 +987,7 @@ static struct net_device_stats *bigmac_get_stats(struct net_device *dev)
struct bigmac *bp = netdev_priv(dev);

bigmac_get_counters(bp, bp->bregs);
return &bp->enet_stats;
return &dev->stats;
}

static void bigmac_set_multicast(struct net_device *dev)
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/sun/sunbmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ struct bigmac {
enum bigmac_timer_state timer_state;
unsigned int timer_ticks;

struct net_device_stats enet_stats;
struct platform_device *qec_op;
struct platform_device *bigmac_op;
struct net_device *dev;
Expand Down

0 comments on commit 0ffa937

Please sign in to comment.