 74d00a8c38
			
		
	
	74d00a8c38
	
	
	
		
			
			* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
		
			
				
	
	
		
			69 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			69 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 6d490f62a4c7f11c552591bdd08eda3636aa0db9 Mon Sep 17 00:00:00 2001
 | |
| From: Florian Fainelli <f.fainelli@gmail.com>
 | |
| Date: Tue, 7 Jun 2016 15:06:15 -0700
 | |
| Subject: [PATCH 3/3] bgmac: Maintain some netdev statistics
 | |
| 
 | |
| Add a few netdev statistics to report transmitted and received bytes and
 | |
| packets and a few obvious errors.
 | |
| 
 | |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 | |
| Signed-off-by: David S. Miller <davem@davemloft.net>
 | |
| ---
 | |
|  drivers/net/ethernet/broadcom/bgmac.c | 10 ++++++++++
 | |
|  1 file changed, 10 insertions(+)
 | |
| 
 | |
| --- a/drivers/net/ethernet/broadcom/bgmac.c
 | |
| +++ b/drivers/net/ethernet/broadcom/bgmac.c
 | |
| @@ -246,6 +246,8 @@ err_dma_head:
 | |
|  
 | |
|  err_drop:
 | |
|  	dev_kfree_skb(skb);
 | |
| +	net_dev->stats.tx_dropped++;
 | |
| +	net_dev->stats.tx_errors++;
 | |
|  	return NETDEV_TX_OK;
 | |
|  }
 | |
|  
 | |
| @@ -285,6 +287,8 @@ static void bgmac_dma_tx_free(struct bgm
 | |
|  				       DMA_TO_DEVICE);
 | |
|  
 | |
|  		if (slot->skb) {
 | |
| +			bgmac->net_dev->stats.tx_bytes += slot->skb->len;
 | |
| +			bgmac->net_dev->stats.tx_packets++;
 | |
|  			bytes_compl += slot->skb->len;
 | |
|  			pkts_compl++;
 | |
|  
 | |
| @@ -468,6 +472,7 @@ static int bgmac_dma_rx_read(struct bgma
 | |
|  				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
 | |
|  					  ring->start);
 | |
|  				put_page(virt_to_head_page(buf));
 | |
| +				bgmac->net_dev->stats.rx_errors++;
 | |
|  				break;
 | |
|  			}
 | |
|  
 | |
| @@ -475,6 +480,8 @@ static int bgmac_dma_rx_read(struct bgma
 | |
|  				bgmac_err(bgmac, "Found oversized packet at slot %d, DMA issue!\n",
 | |
|  					  ring->start);
 | |
|  				put_page(virt_to_head_page(buf));
 | |
| +				bgmac->net_dev->stats.rx_length_errors++;
 | |
| +				bgmac->net_dev->stats.rx_errors++;
 | |
|  				break;
 | |
|  			}
 | |
|  
 | |
| @@ -485,6 +492,7 @@ static int bgmac_dma_rx_read(struct bgma
 | |
|  			if (unlikely(!skb)) {
 | |
|  				bgmac_err(bgmac, "build_skb failed\n");
 | |
|  				put_page(virt_to_head_page(buf));
 | |
| +				bgmac->net_dev->stats.rx_errors++;
 | |
|  				break;
 | |
|  			}
 | |
|  			skb_put(skb, BGMAC_RX_FRAME_OFFSET +
 | |
| @@ -494,6 +502,8 @@ static int bgmac_dma_rx_read(struct bgma
 | |
|  
 | |
|  			skb_checksum_none_assert(skb);
 | |
|  			skb->protocol = eth_type_trans(skb, bgmac->net_dev);
 | |
| +			bgmac->net_dev->stats.rx_bytes += len;
 | |
| +			bgmac->net_dev->stats.rx_packets++;
 | |
|  			napi_gro_receive(&bgmac->napi, skb);
 | |
|  			handled++;
 | |
|  		} while (0);
 |