[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c36366310156
branches:  netbsd-8
changeset: 319116:c36366310156
user:      martin <martin%NetBSD.org@localhost>
date:      Thu May 17 13:58:07 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #827):

        sys/dev/pci/if_wm.c: revision 1.577

rxipsum and rxtusum are not interrupt counter, so use EVCNT_TYPE_MISC
instead of EVCNT_TYPE_INTR.

diffstat:

 sys/dev/pci/if_wm.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r a3b6e64f2fff -r c36366310156 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue May 15 13:50:20 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Thu May 17 13:58:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.18 2018/05/09 15:28:44 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $  */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.18 2018/05/09 15:28:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -6501,8 +6501,8 @@
                WM_Q_INTR_EVCNT_ATTACH(rxq, rxintr, rxq, i, xname);
                WM_Q_INTR_EVCNT_ATTACH(rxq, rxdefer, rxq, i, xname);
 
-               WM_Q_INTR_EVCNT_ATTACH(rxq, rxipsum, rxq, i, xname);
-               WM_Q_INTR_EVCNT_ATTACH(rxq, rxtusum, rxq, i, xname);
+               WM_Q_MISC_EVCNT_ATTACH(rxq, rxipsum, rxq, i, xname);
+               WM_Q_MISC_EVCNT_ATTACH(rxq, rxtusum, rxq, i, xname);
 #endif /* WM_EVENT_COUNTERS */
 
                rx_done++;