---

yaml --- r: 49037 b: refs/heads/master c: a79abdc h: refs/heads/master i: 49035: 0c6c793 v: v3
git-mirror · Feb 17, 2007 · 2f45728 · 2f45728
1 parent 24bd680
commit 2f45728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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;
 	}