diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-07 06:02:34 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-07 06:02:34 +0000 |
| commit | 83594f159095bf53c4e153a9b1d68e1e61ec69d8 (patch) | |
| tree | a9cb895eb2b995946250e05fa15b8078a4d1daa4 | |
| parent | c7310d502f10a9e3092af19178fdbe862039e949 (diff) | |
eliminate use of M_HASFCS
ok brad@
from NetBSD
| -rw-r--r-- | sys/arch/macppc/dev/if_bm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c index 74af5cc37b0..280c02cbd2b 100644 --- a/sys/arch/macppc/dev/if_bm.c +++ b/sys/arch/macppc/dev/if_bm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bm.c,v 1.18 2005/06/08 17:03:02 henning Exp $ */ +/* $OpenBSD: if_bm.c,v 1.19 2005/10/07 06:02:33 martin Exp $ */ /* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */ /*- @@ -587,8 +587,11 @@ bmac_rint(void *v) /* XXX Sometimes bmac reads one extra byte. */ if (datalen == ETHER_MAX_LEN + 1) datalen--; - m = bmac_get(sc, data, datalen); + /* Trim the CRC. */ + datalen -= ETHER_CRC_LEN; + + m = bmac_get(sc, data, datalen); if (m == NULL) { ifp->if_ierrors++; goto next; @@ -745,9 +748,6 @@ bmac_get(struct bmac_softc *sc, caddr_t pkt, int totlen) MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == 0) return 0; - /* - XXX - m->m_flags |= M_HASFCS; - */ m->m_pkthdr.rcvif = &sc->sc_if; m->m_pkthdr.len = totlen; len = MHLEN; |