Module Name: src
Committed By: msaitoh
Date: Thu Nov 8 14:32:02 UTC 2012
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
Don't use M_HASFCS flag.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/marvell/if_mvgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.28 src/sys/dev/marvell/if_mvgbe.c:1.29
--- src/sys/dev/marvell/if_mvgbe.c:1.28 Thu Nov 1 02:46:41 2012
+++ src/sys/dev/marvell/if_mvgbe.c Thu Nov 8 14:32:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.28 2012/11/01 02:46:41 msaitoh Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.29 2012/11/08 14:32:01 msaitoh Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.28 2012/11/01 02:46:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.29 2012/11/08 14:32:01 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1823,7 +1823,7 @@ mvgbe_rxeof(struct mvgbe_softc *sc)
m = cdata->mvgbe_rx_chain[idx].mvgbe_mbuf;
cdata->mvgbe_rx_chain[idx].mvgbe_mbuf = NULL;
- total_len = cur_rx->bytecnt;
+ total_len = cur_rx->bytecnt - ETHER_CRC_LEN;
rxstat = cur_rx->cmdsts;
bufsize = cur_rx->bufsize;
@@ -1908,7 +1908,6 @@ mvgbe_rxeof(struct mvgbe_softc *sc)
/* Skip on first 2byte (HW header) */
m_adj(m, MVGBE_HWHEADER_SIZE);
- m->m_flags |= M_HASFCS;
ifp->if_ipackets++;