diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-09-28 09:48:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-10 10:50:15 -0700 |
| commit | dc8a4bca289e51866f01a41a29793199cd0e28f0 (patch) | |
| tree | febaf41cc416b806b149f9d72d38064400c8e633 | |
| parent | 294bb426fa9eae8fc3af3759787b7b92107fc2ce (diff) | |
| download | lwn-dc8a4bca289e51866f01a41a29793199cd0e28f0.tar.gz lwn-dc8a4bca289e51866f01a41a29793199cd0e28f0.zip | |
sky2: fix VLAN receive processing
Already upstream.
The length check for truncated frames was not correctly handling
the case where VLAN acceleration had already read the tag.
Also, the Yukon EX has some features that use high bit of status
as security tag.
Signed-off-by: Pierre-Yves Ritschard <pyr@spootnik.org>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 4fd95010960e..d9c8b9f692b7 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2049,6 +2049,7 @@ static struct sk_buff *sky2_receive(struct net_device *dev, struct sky2_port *sky2 = netdev_priv(dev); struct rx_ring_info *re = sky2->rx_ring + sky2->rx_next; struct sk_buff *skb = NULL; + u16 count; if (unlikely(netif_msg_rx_status(sky2))) printk(KERN_DEBUG PFX "%s: rx slot %u status 0x%x len %d\n", @@ -2063,7 +2064,13 @@ static struct sk_buff *sky2_receive(struct net_device *dev, if (!(status & GMR_FS_RX_OK)) goto resubmit; - if (status >> 16 != length) + count = (status & GMR_FS_LEN) >> 16; +#ifdef SKY2_VLAN_TAG_USED + /* Account for vlan tag */ + if (sky2->vlgrp && (status & GMR_FS_VLAN)) + count -= VLAN_HLEN; +#endif + if (count != length) goto len_mismatch; if (length < copybreak) |