Skip to content

Commit 69adbce

Browse files
committed
Eliminate use of M_HASFCS.
1 parent cd08fa2 commit 69adbce

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

sys/dev/ic/atw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: atw.c,v 1.82 2005/01/04 00:56:51 dyoung Exp $ */
1+
/* $NetBSD: atw.c,v 1.83 2005/01/31 03:06:40 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
4141
*/
4242

4343
#include <sys/cdefs.h>
44-
__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.82 2005/01/04 00:56:51 dyoung Exp $");
44+
__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.83 2005/01/31 03:06:40 thorpej Exp $");
4545

4646
#include "bpfilter.h"
4747

@@ -3091,7 +3091,7 @@ atw_rxintr(struct atw_softc *sc)
30913091

30923092
ifp->if_ipackets++;
30933093
if (sc->sc_opmode & ATW_NAR_PR)
3094-
m->m_flags |= M_HASFCS;
3094+
len -= IEEE80211_CRC_LEN;
30953095
m->m_pkthdr.rcvif = ifp;
30963096
m->m_pkthdr.len = m->m_len = MIN(m->m_ext.ext_size, len);
30973097

sys/dev/ic/dp83932.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: dp83932.c,v 1.10 2004/10/30 18:08:36 thorpej Exp $ */
1+
/* $NetBSD: dp83932.c,v 1.11 2005/01/31 03:04:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
4242
*/
4343

4444
#include <sys/cdefs.h>
45-
__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.10 2004/10/30 18:08:36 thorpej Exp $");
45+
__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.11 2005/01/31 03:04:25 thorpej Exp $");
4646

4747
#include "bpfilter.h"
4848

@@ -766,7 +766,7 @@ sonic_rxintr(struct sonic_softc *sc)
766766
/*
767767
* The SONIC includes the CRC with every packet.
768768
*/
769-
len = bytecount;
769+
len = bytecount - ETHER_CRC_LEN;
770770

771771
/*
772772
* Ok, if the chip is in 32-bit mode, then receive
@@ -835,7 +835,6 @@ sonic_rxintr(struct sonic_softc *sc)
835835
}
836836

837837
ifp->if_ipackets++;
838-
m->m_flags |= M_HASFCS;
839838
m->m_pkthdr.rcvif = ifp;
840839
m->m_pkthdr.len = m->m_len = len;
841840

0 commit comments

Comments
 (0)