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

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

details:   https://anonhg.NetBSD.org/src/rev/cf4ceec1834b
branches:  netbsd-8
changeset: 852328:cf4ceec1834b
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 07 13:46:39 2019 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #1228):

        sys/dev/pci/if_bge.c: revision 1.328

Fix ASIC check, BGE_ASICREV(sc->bge_chipid) is not a chipid.

Fixes bogus input error reporting in stat. This is cosmetic, exept for
routed(8) which thinks that the interface is broken and stops accepting routes
from it.

diffstat:

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

diffs (29 lines):

diff -r 9221d6137bc0 -r cf4ceec1834b sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Sun Apr 07 11:02:13 2019 +0000
+++ b/sys/dev/pci/if_bge.c      Sun Apr 07 13:46:39 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.310.2.5 2019/03/07 17:38:59 martin Exp $  */
+/*     $NetBSD: if_bge.c,v 1.310.2.6 2019/04/07 13:46:39 martin Exp $  */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.310.2.5 2019/03/07 17:38:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.310.2.6 2019/04/07 13:46:39 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -4769,8 +4769,8 @@
         * ignore the counter
         */
        if (BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5717 &&
-           BGE_ASICREV(sc->bge_chipid) != BGE_CHIPID_BCM5719_A0 &&
-           BGE_ASICREV(sc->bge_chipid) != BGE_CHIPID_BCM5720_A0) {
+           sc->bge_chipid != BGE_CHIPID_BCM5719_A0 &&
+           sc->bge_chipid != BGE_CHIPID_BCM5720_A0) {
                ifp->if_ierrors += CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS);
        }
        ifp->if_ierrors += CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_ERRORS);