commit 864ab1276f04f5ff8b593a3abb9d3ccf635d0832
author Irina Stanescu <irinams@google.com> Wed Apr 03 23:17:36 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 03 23:17:37 2013 +0000
tree a8174ae59dc69e98e91518cfd5185b9bc91925a1
parent 36e79ec79c9bd488a65775c13b4978c099777b86
parent adeb62a96d332292038adac051abe8997e937d28

Merge "Add per queue drop count to rx_over_errors."

drivers/net/bcmgenet/bcmgenet.c

diff --git a/drivers/net/bcmgenet/bcmgenet.c b/drivers/net/bcmgenet/bcmgenet.c
index 3a18e43..92f9855 100755
--- a/drivers/net/bcmgenet/bcmgenet.c
+++ b/drivers/net/bcmgenet/bcmgenet.c
@@ -1915,8 +1915,7 @@
 		if (rx_discard_flag) {
 			int discard_cnt = rDma_ring->rdma_producer_index >> 16;
 			/* Report rx overrun errors */
-			pDevCtrl->dev->stats.rx_over_errors += discard_cnt -
-				pDevCtrl->rxRingDiscCnt[i];
+			pDevCtrl->dev->stats.rx_over_errors += discard_cnt;
 			pDevCtrl->rxRingDiscCnt[i] += discard_cnt;
 			rDma_ring->rdma_producer_index = 0;
 		}
@@ -2012,7 +2011,7 @@
 				if (dmaFlag & DMA_RX_CRC_ERROR)
 					pDevCtrl->dev->stats.rx_crc_errors++;
 				if (dmaFlag & DMA_RX_OV)
-					pDevCtrl->dev->stats.rx_over_errors++;
+					pDevCtrl->dev->stats.rx_fifo_errors++;
 				if (dmaFlag & DMA_RX_NO)
 					pDevCtrl->dev->stats.rx_frame_errors++;
 				if (dmaFlag & DMA_RX_LG)
@@ -2234,6 +2233,8 @@
 
 	discard_cnt = (rDma_desc->rdma_producer_index >> 16);
 	if (discard_cnt) {
+		/* Report rx overrun errors */
+		pDevCtrl->dev->stats.rx_over_errors += discard_cnt;
 		pDevCtrl->rxRingDiscCnt[index] += discard_cnt;
 		rDma_desc->rdma_producer_index = 0;
 	}
@@ -2287,7 +2288,7 @@
 			if (dmaFlag & DMA_RX_CRC_ERROR)
 				dev->stats.rx_crc_errors++;
 			if (dmaFlag & DMA_RX_OV)
-				dev->stats.rx_over_errors++;
+				dev->stats.rx_fifo_errors++;
 			if (dmaFlag & DMA_RX_NO)
 				dev->stats.rx_frame_errors++;
 			if (dmaFlag & DMA_RX_LG)