Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ffa9373 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

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: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b09a9537

drivers/net/ethernet/sun/sunbmac.c

+9 −9
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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;
@@ -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];
@@ -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)

drivers/net/ethernet/sun/sunbmac.h

+0 −1
Original line number Diff line number Diff line
@@ -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;