diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-09-19 15:36:42 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-20 15:22:59 -0400 |
| commit | d6532232cd3de79c852685823a9c52f723816d0a (patch) | |
| tree | ff6fc85a36020202709dfb915a60f6941585b9e7 /drivers/net/sky2.h | |
| parent | 680e9fe9d69ea86e81c859932bfd751be91cc0e0 (diff) | |
| download | lwn-d6532232cd3de79c852685823a9c52f723816d0a.tar.gz lwn-d6532232cd3de79c852685823a9c52f723816d0a.zip | |
sky2: fix VLAN receive processing (resend)
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: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 72e12b7cfa40..3baae48f8042 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -1668,7 +1668,7 @@ enum { /* Receive Frame Status Encoding */ enum { - GMR_FS_LEN = 0xffff<<16, /* Bit 31..16: Rx Frame Length */ + GMR_FS_LEN = 0x7fff<<16, /* Bit 30..16: Rx Frame Length */ GMR_FS_VLAN = 1<<13, /* VLAN Packet */ GMR_FS_JABBER = 1<<12, /* Jabber Packet */ GMR_FS_UN_SIZE = 1<<11, /* Undersize Packet */ |