From 8bf63a864db114bd8f1d2c384a1aa1a20e3d6529 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 9 Jul 2007 15:33:40 -0700
Subject: [PATCH] --- yaml --- r: 58724 b: refs/heads/master c:
 71749531f2d1954137a1a77422ef4ff29eb102dd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5156db4ca02e..ee2f573eec32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4331a6d24f2e5524678caf4621d35f33fb934da
+refs/heads/master: 71749531f2d1954137a1a77422ef4ff29eb102dd
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 99a999383e9b..4e0b839de7e4 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/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 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 
 	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) {