summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-07-09 15:33:40 -0700
committerJeff Garzik <jeff@garzik.org>2007-07-10 12:22:29 -0400
commit71749531f2d1954137a1a77422ef4ff29eb102dd (patch)
tree13a9a26660c96d070b8ade9255192b7e6ff573ba
parentf4331a6d24f2e5524678caf4621d35f33fb934da (diff)
downloadkernel-crypto-71749531f2d1954137a1a77422ef4ff29eb102dd.tar.gz
kernel-crypto-71749531f2d1954137a1a77422ef4ff29eb102dd.tar.xz
kernel-crypto-71749531f2d1954137a1a77422ef4ff29eb102dd.zip
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>
-rw-r--r--drivers/net/sky2.c8
1 files changed, 8 insertions, 0 deletions
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) {