Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/cavium/dev Remove the IFETHER_DOT3STATS stuff ...



details:   https://anonhg.NetBSD.org/src/rev/711557dc2374
branches:  trunk
changeset: 1006741:711557dc2374
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 25 19:20:24 2020 +0000

description:
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.

diffstat:

 sys/arch/mips/cavium/dev/octeon_gmx.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (39 lines):

diff -r d35a6028ffce -r 711557dc2374 sys/arch/mips/cavium/dev/octeon_gmx.c
--- a/sys/arch/mips/cavium/dev/octeon_gmx.c     Sat Jan 25 19:09:38 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_gmx.c     Sat Jan 25 19:20:24 2020 +0000
@@ -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 @@
        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);



Home | Main Index | Thread Index | Old Index