From 4d806a025adfbeeefe687d8487cbb35ab1605d7c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 4 Jan 2009 16:23:01 -0800 Subject: [PATCH] --- yaml --- r: 125945 b: refs/heads/master c: 22692018b93f0782cda5a843cecfffda1854eb8d h: refs/heads/master i: 125943: 5db63a65e2738c2035e226956f1f1241fd9a64c5 v: v3 --- [refs] | 2 +- trunk/drivers/net/enc28j60.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ec8b4c2bd30d..16502b364635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fecc7036e73a71231045e03ff524b5f8bd892a84 +refs/heads/master: 22692018b93f0782cda5a843cecfffda1854eb8d diff --git a/trunk/drivers/net/enc28j60.c b/trunk/drivers/net/enc28j60.c index b0ef46c51a9d..cefe1d98f93e 100644 --- a/trunk/drivers/net/enc28j60.c +++ b/trunk/drivers/net/enc28j60.c @@ -944,7 +944,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) if (netif_msg_rx_status(priv)) enc28j60_dump_rsv(priv, __func__, next_packet, len, rxstat); - if (!RSV_GETBIT(rxstat, RSV_RXOK)) { + if (!RSV_GETBIT(rxstat, RSV_RXOK) || len > MAX_FRAMELEN) { if (netif_msg_rx_err(priv)) dev_err(&ndev->dev, "Rx Error (%04x)\n", rxstat); ndev->stats.rx_errors++; @@ -952,6 +952,8 @@ static void enc28j60_hw_rx(struct net_device *ndev) ndev->stats.rx_crc_errors++; if (RSV_GETBIT(rxstat, RSV_LENCHECKERR)) ndev->stats.rx_frame_errors++; + if (len > MAX_FRAMELEN) + ndev->stats.rx_over_errors++; } else { skb = dev_alloc_skb(len + NET_IP_ALIGN); if (!skb) {