From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 9 Jul 2007 22:33:40 +0000 (-0700)
Subject: sky2: check drop truncated packets
X-Git-Tag: v2.6.23-rc1~1151^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=71749531f2d1954137a1a77422ef4ff29eb102dd;p=linux-2.6-omap-h63xx.git

sky2: check drop truncated packets

If packet larger than MTU is received, the driver uses hardware to
truncate the packet. Use the status registers to catch/drop them.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 99a999383e9..4e0b839de7e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2109,6 +2109,9 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 	if (!(status & GMR_FS_RX_OK))
 		goto resubmit;
 
+	if (status >> 16 != length)
+		goto len_mismatch;
+
 	if (length < copybreak)
 		skb = receive_copy(sky2, re, length);
 	else
@@ -2118,6 +2121,11 @@ resubmit:
 
 	return skb;
 
+len_mismatch:
+	/* Truncation of overlength packets
+	   causes PHY length to not match MAC length */
+	++sky2->net_stats.rx_length_errors;
+
 error:
 	++sky2->net_stats.rx_errors;
 	if (status & GMR_FS_RX_FF_OV) {