diff options
| author | Peter Stromberg <wilfried@cvs.openbsd.org> | 2005-11-28 17:53:15 +0000 |
|---|---|---|
| committer | Peter Stromberg <wilfried@cvs.openbsd.org> | 2005-11-28 17:53:15 +0000 |
| commit | de2aee7defecdfc8a5a1fccce6d9cdd7d04d9e73 (patch) | |
| tree | a7bfeadf038bf555886a4d497456791d72a9e19b /sys/dev/pci/if_em.c | |
| parent | a6d6ab326e6252388253d827a92604a2f0a65c37 (diff) | |
back out last change, caused me panics on jumbo packets, ok deraadt@
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 52fb65b356a..e824d01e7a0 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.96 2005/11/27 06:37:13 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.97 2005/11/28 17:53:14 wilfried Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -2006,7 +2006,9 @@ em_get_buf(int i, struct em_softc *sc, struct mbuf *nmp) mp->m_next = NULL; } - m_adj(mp, ETHER_ALIGN); + if (ifp->if_mtu <= ETHERMTU) { + m_adj(mp, ETHER_ALIGN); + } rx_buffer = &sc->rx_buffer_area[i]; |