Module Name: src
Committed By: thorpej
Date: Sat Jan 25 19:20:24 UTC 2020
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_gmx.c
Log Message:
Remove the IFETHER_DOT3STATS stuff in this driver. ifi_dot3stats does
not exist in NetBSD's "struct if_data", and what this driver does with
it is incompatible with upcoming network stack changes.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/dev/octeon_gmx.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/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.6 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.7
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.6 Sun Nov 10 21:16:30 2019
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Sat Jan 25 19:20:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.6 2019/11/10 21:16:30 chs Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.7 2020/01/25 19:20:24 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.6 2019/11/10 21:16:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.7 2020/01/25 19:20:24 thorpej Exp $");
#include "opt_octeon.h"
@@ -1080,20 +1080,10 @@ octeon_gmx_stats(struct octeon_gmx_port_
ifp->if_oerrors +=
(uint32_t)tmp + ((uint32_t)(tmp >> 32) * 16);
ifp->if_collisions += (uint32_t)tmp;
-#if IFETHER_DOT3STATS
- /* dot3StatsExcessiveCollisions */
- ifp->if_data.ifi_dot3stats.if_oexsvcols += (uint32_t)tmp;
-#endif
tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT1);
ifp->if_collisions +=
(uint32_t)tmp + (uint32_t)(tmp >> 32);
-#if IFETHER_DOT3STATS
- /* dot3StatsSingleCollisionFrames */
- ifp->if_data.ifi_dot3stats.if_oscols += (uint32_t)(tmp >> 32);
- /* dot3StatsMultipleCollisionFrames */
- ifp->if_data.ifi_dot3stats.if_omcols += (uint32_t)tmp;
-#endif
tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT9);
ifp->if_oerrors += (uint32_t)(tmp >> 32);
