Module Name: src
Committed By: martin
Date: Sun Apr 7 13:46:39 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: if_bge.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.310.2.5 -r1.310.2.6 src/sys/dev/pci/if_bge.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/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.310.2.5 src/sys/dev/pci/if_bge.c:1.310.2.6
--- src/sys/dev/pci/if_bge.c:1.310.2.5 Thu Mar 7 17:38:59 2019
+++ src/sys/dev/pci/if_bge.c Sun Apr 7 13:46:39 2019
@@ -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 @@ bge_stats_update_regs(struct bge_softc *
* 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);
