From: Daniel Inderbitzin <daniel.inderbitzin@crypto.ch>
Date: Fri, 10 Jul 2015 12:06:02 +0000 (+0200)
Subject: qoriq eth.c bugfix: handle received corrupted frames correctly
X-Git-Tag: v2015.10-rc2~61^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=466f775e02bcde5ea7454cd73ecf1a0f79275a30;p=oweals%2Fu-boot.git

qoriq eth.c bugfix: handle received corrupted frames correctly

The rxbd is not correctly handled in case of a frame physical error
(FPE) or frame size error (FSE). The rxbd must be cleared and
advanced in case of an error to avoid receive stall.

Signed-off-by: Daniel Inderbitzin <daniel.inderbitzin@gmail.com>
---

diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index d7a37f39a8..6702f5a520 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -520,6 +520,7 @@ static int fm_eth_recv(struct eth_device *dev)
 	u16 status, len;
 	u8 *data;
 	u16 offset_out;
+	int ret = 1;
 
 	fm_eth = (struct fm_eth *)dev->priv;
 	pram = fm_eth->rx_pram;
@@ -533,7 +534,7 @@ static int fm_eth_recv(struct eth_device *dev)
 			net_process_received_packet(data, len);
 		} else {
 			printf("%s: Rx error\n", dev->name);
-			return 0;
+			ret = 0;
 		}
 
 		/* clear the RxBDs */
@@ -559,7 +560,7 @@ static int fm_eth_recv(struct eth_device *dev)
 	}
 	fm_eth->cur_rxbd = (void *)rxbd;
 
-	return 1;
+	return ret;
 }
 
 static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg)