OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
 
CVS: cvs.openbsd.org: src

From: Brad Smith (bradcvs.openbsd.org)
Date: Wed Nov 01 2006 - 19:56:59 CST


CVSROOT: /cvs
Module name: src
Changes by: bradcvs.openbsd.org 2006/11/01 18:56:59

Modified files:
        sys/dev/pci : Tag: OPENBSD_4_0 if_em.c

Log message:
MFC:
Fix by brad

revert revision 1.131, the code in question was later found to not ensure
the proper alignment requirement for the VLAN layer on strict alignment
architectures. This would result in Jumbo's working fine as long as VLANs
were not in use. If VLANs were in use and a packet comes in with a size
of 2046 bytes or larger, it would be corrupted as it came up through the
VLAN layer. Also check the hw max frame size, instead of the MTU, so the
alignment fixup is done as appropriate.

Fixes PR 5185.
Tested by Rui DeSousa with macppc and myself with alpha/sparc64