fec: fix rx error counts

On an overrun, the other flags are not
valid, so don't check them.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

1 files changed, 22 insertions, 21 deletions

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index fd3067688cba..5274af7b418f 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -875,35 +875,36 @@ fec_enet_rx(struct net_device *ndev, int budget)
 		/* Since we have allocated space to hold a complete frame,
 		 * the last indicator should be set.
 		 */
-		if ((status & BD_ENET_RX_LAST) == 0)
-			netdev_err(ndev, "rcv is not +last\n");
 
 		if (!fep->opened)
 			goto rx_processing_done;
 
 		/* Check for errors. */
+		status ^= BD_ENET_RX_LAST;
 		if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
-			   BD_ENET_RX_CR | BD_ENET_RX_OV)) {
+			   BD_ENET_RX_CR | BD_ENET_RX_OV | BD_ENET_RX_LAST |
+			   BD_ENET_RX_CL)) {
 			ndev->stats.rx_errors++;
-			if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
-				/* Frame too long or too short. */
-				ndev->stats.rx_length_errors++;
-			}
-			if (status & BD_ENET_RX_NO)	/* Frame alignment */
-				ndev->stats.rx_frame_errors++;
-			if (status & BD_ENET_RX_CR)	/* CRC Error */
-				ndev->stats.rx_crc_errors++;
-			if (status & BD_ENET_RX_OV)	/* FIFO overrun */
+			if (status & BD_ENET_RX_OV) {
+				/* FIFO overrun */
 				ndev->stats.rx_fifo_errors++;
-		}
-
-		/* Report late collisions as a frame error.
-		 * On this error, the BD is closed, but we don't know what we
-		 * have in the buffer.  So, just drop this frame on the floor.
-		 */
-		if (status & BD_ENET_RX_CL) {
-			ndev->stats.rx_errors++;
-			ndev->stats.rx_frame_errors++;
+			} else {
+				if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH
+						| BD_ENET_RX_LAST)) {
+					/* Frame too long or too short. */
+					ndev->stats.rx_length_errors++;
+					if (status & BD_ENET_RX_LAST)
+						netdev_err(ndev,
+							"rcv is not +last\n");
+				}
+				if (status & BD_ENET_RX_CR)	/* CRC Error */
+					ndev->stats.rx_crc_errors++;
+				/*
+				 * Report late collisions as a frame error.
+				 */
+				if (status & (BD_ENET_RX_NO | BD_ENET_RX_CL))
+					ndev->stats.rx_frame_errors++;
+			}
 			goto rx_processing_done;
 		}