net: macb: Use net_device_stats from struct net_device (5f1d3a5c) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/ethernet/cadence/macb.c

+20 −20

Original line number	Original line	Diff line number	Diff line
	@@ -684,8 +684,8 @@ static void macb_tx_error_task(struct work_struct *work)
	netdev_vdbg(bp->dev, "txerr skb %u (data %p) TX complete\n",		netdev_vdbg(bp->dev, "txerr skb %u (data %p) TX complete\n",
	macb_tx_ring_wrap(bp, tail),		macb_tx_ring_wrap(bp, tail),
	skb->data);		skb->data);
	bp->stats.tx_packets++;		bp->dev->stats.tx_packets++;
	bp->stats.tx_bytes += skb->len;		bp->dev->stats.tx_bytes += skb->len;
	}		}
	} else {		} else {
	/* "Buffers exhausted mid-frame" errors may only happen		/* "Buffers exhausted mid-frame" errors may only happen
	@@ -778,8 +778,8 @@ static void macb_tx_interrupt(struct macb_queue *queue)
	netdev_vdbg(bp->dev, "skb %u (data %p) TX complete\n",		netdev_vdbg(bp->dev, "skb %u (data %p) TX complete\n",
	macb_tx_ring_wrap(bp, tail),		macb_tx_ring_wrap(bp, tail),
	skb->data);		skb->data);
	bp->stats.tx_packets++;		bp->dev->stats.tx_packets++;
	bp->stats.tx_bytes += skb->len;		bp->dev->stats.tx_bytes += skb->len;
	}		}

	/* Now we can safely release resources */		/* Now we can safely release resources */
	@@ -911,14 +911,14 @@ static int gem_rx(struct macb *bp, int budget)
	if (!(ctrl & MACB_BIT(RX_SOF) && ctrl & MACB_BIT(RX_EOF))) {		if (!(ctrl & MACB_BIT(RX_SOF) && ctrl & MACB_BIT(RX_EOF))) {
	netdev_err(bp->dev,		netdev_err(bp->dev,
	"not whole frame pointed by descriptor\n");		"not whole frame pointed by descriptor\n");
	bp->stats.rx_dropped++;		bp->dev->stats.rx_dropped++;
	break;		break;
	}		}
	skb = bp->rx_skbuff[entry];		skb = bp->rx_skbuff[entry];
	if (unlikely(!skb)) {		if (unlikely(!skb)) {
	netdev_err(bp->dev,		netdev_err(bp->dev,
	"inconsistent Rx descriptor chain\n");		"inconsistent Rx descriptor chain\n");
	bp->stats.rx_dropped++;		bp->dev->stats.rx_dropped++;
	break;		break;
	}		}
	/* now everything is ready for receiving packet */		/* now everything is ready for receiving packet */
	@@ -938,8 +938,8 @@ static int gem_rx(struct macb *bp, int budget)
	GEM_BFEXT(RX_CSUM, ctrl) & GEM_RX_CSUM_CHECKED_MASK)		GEM_BFEXT(RX_CSUM, ctrl) & GEM_RX_CSUM_CHECKED_MASK)
	skb->ip_summed = CHECKSUM_UNNECESSARY;		skb->ip_summed = CHECKSUM_UNNECESSARY;

	bp->stats.rx_packets++;		bp->dev->stats.rx_packets++;
	bp->stats.rx_bytes += skb->len;		bp->dev->stats.rx_bytes += skb->len;

	#if defined(DEBUG) && defined(VERBOSE_DEBUG)		#if defined(DEBUG) && defined(VERBOSE_DEBUG)
	netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",		netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",
	@@ -984,7 +984,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
	*/		*/
	skb = netdev_alloc_skb(bp->dev, len + NET_IP_ALIGN);		skb = netdev_alloc_skb(bp->dev, len + NET_IP_ALIGN);
	if (!skb) {		if (!skb) {
	bp->stats.rx_dropped++;		bp->dev->stats.rx_dropped++;
	for (frag = first_frag; ; frag++) {		for (frag = first_frag; ; frag++) {
	desc = macb_rx_desc(bp, frag);		desc = macb_rx_desc(bp, frag);
	desc->addr &= ~MACB_BIT(RX_USED);		desc->addr &= ~MACB_BIT(RX_USED);
	@@ -1030,8 +1030,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
	__skb_pull(skb, NET_IP_ALIGN);		__skb_pull(skb, NET_IP_ALIGN);
	skb->protocol = eth_type_trans(skb, bp->dev);		skb->protocol = eth_type_trans(skb, bp->dev);

	bp->stats.rx_packets++;		bp->dev->stats.rx_packets++;
	bp->stats.rx_bytes += skb->len;		bp->dev->stats.rx_bytes += skb->len;
	netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",		netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",
	skb->len, skb->csum);		skb->len, skb->csum);
	netif_receive_skb(skb);		netif_receive_skb(skb);
	@@ -2210,7 +2210,7 @@ static void gem_update_stats(struct macb *bp)
	static struct net_device_stats gem_get_stats(struct macb bp)		static struct net_device_stats gem_get_stats(struct macb bp)
	{		{
	struct gem_stats *hwstat = &bp->hw_stats.gem;		struct gem_stats *hwstat = &bp->hw_stats.gem;
	struct net_device_stats *nstat = &bp->stats;		struct net_device_stats *nstat = &bp->dev->stats;

	gem_update_stats(bp);		gem_update_stats(bp);

	@@ -2281,7 +2281,7 @@ static void gem_get_ethtool_strings(struct net_device dev, u32 sset, u8 p)
	static struct net_device_stats macb_get_stats(struct net_device dev)		static struct net_device_stats macb_get_stats(struct net_device dev)
	{		{
	struct macb *bp = netdev_priv(dev);		struct macb *bp = netdev_priv(dev);
	struct net_device_stats *nstat = &bp->stats;		struct net_device_stats *nstat = &bp->dev->stats;
	struct macb_stats *hwstat = &bp->hw_stats.macb;		struct macb_stats *hwstat = &bp->hw_stats.macb;

	if (macb_is_gem(bp))		if (macb_is_gem(bp))
	@@ -2993,15 +2993,15 @@ static void at91ether_rx(struct net_device *dev)
	memcpy(skb_put(skb, pktlen), p_recv, pktlen);		memcpy(skb_put(skb, pktlen), p_recv, pktlen);

	skb->protocol = eth_type_trans(skb, dev);		skb->protocol = eth_type_trans(skb, dev);
	lp->stats.rx_packets++;		dev->stats.rx_packets++;
	lp->stats.rx_bytes += pktlen;		dev->stats.rx_bytes += pktlen;
	netif_rx(skb);		netif_rx(skb);
	} else {		} else {
	lp->stats.rx_dropped++;		dev->stats.rx_dropped++;
	}		}

	if (desc->ctrl & MACB_BIT(RX_MHASH_MATCH))		if (desc->ctrl & MACB_BIT(RX_MHASH_MATCH))
	lp->stats.multicast++;		dev->stats.multicast++;

	/* reset ownership bit */		/* reset ownership bit */
	desc->addr &= ~MACB_BIT(RX_USED);		desc->addr &= ~MACB_BIT(RX_USED);
	@@ -3036,15 +3036,15 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
	if (intstatus & MACB_BIT(TCOMP)) {		if (intstatus & MACB_BIT(TCOMP)) {
	/* The TCOM bit is set even if the transmission failed */		/* The TCOM bit is set even if the transmission failed */
	if (intstatus & (MACB_BIT(ISR_TUND) \| MACB_BIT(ISR_RLE)))		if (intstatus & (MACB_BIT(ISR_TUND) \| MACB_BIT(ISR_RLE)))
	lp->stats.tx_errors++;		dev->stats.tx_errors++;

	if (lp->skb) {		if (lp->skb) {
	dev_kfree_skb_irq(lp->skb);		dev_kfree_skb_irq(lp->skb);
	lp->skb = NULL;		lp->skb = NULL;
	dma_unmap_single(NULL, lp->skb_physaddr,		dma_unmap_single(NULL, lp->skb_physaddr,
	lp->skb_length, DMA_TO_DEVICE);		lp->skb_length, DMA_TO_DEVICE);
	lp->stats.tx_packets++;		dev->stats.tx_packets++;
	lp->stats.tx_bytes += lp->skb_length;		dev->stats.tx_bytes += lp->skb_length;
	}		}
	netif_wake_queue(dev);		netif_wake_queue(dev);
	}		}

drivers/net/ethernet/cadence/macb.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -919,7 +919,6 @@ struct macb {
	struct clk *rx_clk;		struct clk *rx_clk;
	struct net_device *dev;		struct net_device *dev;
	struct napi_struct napi;		struct napi_struct napi;
	struct net_device_stats stats;
	union {		union {
	struct macb_stats macb;		struct macb_stats macb;
	struct gem_stats gem;		struct gem_stats gem;