diff mbox

[U-Boot] qoriq eth.c bugfix: handle received corrupted frames correctly

Message ID 1436529962-3880-1-git-send-email-daniel.inderbitzin@gmail.com
State Accepted
Delegated to: Joe Hershberger
Headers show

Commit Message

Daniel Inderbitzin July 10, 2015, 12:06 p.m. UTC 
From: Daniel Inderbitzin <daniel.inderbitzin@crypto.ch>

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>
---

 drivers/net/fm/eth.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Joe Hershberger Aug. 12, 2015, 7:25 p.m. UTC | #1 
Hi Daniel,

On Fri, Jul 10, 2015 at 7:06 AM, Daniel Inderbitzin
<daniel.inderbitzin@gmail.com> wrote:
> From: Daniel Inderbitzin <daniel.inderbitzin@crypto.ch>
>
> 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>

Applied to u-boot-net, thanks!
-Joe
diff mbox

Patch

diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index d7a37f3..6702f5a 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)