---

yaml --- r: 58724 b: refs/heads/master c: 7174953 h: refs/heads/master v: v3
git-mirror · Jul 10, 2007 · 8bf63a8 · 8bf63a8
1 parent 1862e1c
commit 8bf63a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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) {