From 2f4572864aab355352a0b75a1e19e73f22265c8b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 15 Feb 2007 16:40:34 -0800
Subject: [PATCH] --- yaml --- r: 49037 b: refs/heads/master c:
 a79abdc6eeca745b2af04fc03f9a04da0d294094 h: refs/heads/master i:   49035:
 0c6c793b9d2c10b6017eb2bd99d6f14a3a4ec6ba v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index edb31d68d09c..61d5b79a5fd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 819067916d785cac0369b8d6e187b4a83fd17785
+refs/heads/master: a79abdc6eeca745b2af04fc03f9a04da0d294094
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index fafa4021bb8a..c058117d2a63 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2056,9 +2056,6 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 	if (!(status & GMR_FS_RX_OK))
 		goto resubmit;
 
-	if (length > dev->mtu + ETH_HLEN)
-		goto oversize;
-
 	if (length < copybreak)
 		skb = receive_copy(sky2, re, length);
 	else
@@ -2068,14 +2065,10 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 
 	return skb;
 
-oversize:
-	++sky2->net_stats.rx_over_errors;
-	goto resubmit;
-
 error:
 	++sky2->net_stats.rx_errors;
 	if (status & GMR_FS_RX_FF_OV) {
-		sky2->net_stats.rx_fifo_errors++;
+		sky2->net_stats.rx_over_errors++;
 		goto resubmit;
 	}