[src/trunk]: src/sys/dev/pci Fix a bug that SK-9D41 can't detect fiber media....

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

details:   https://anonhg.NetBSD.org/src/rev/135c28a54b7f
branches:  trunk
changeset: 1005023:135c28a54b7f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Nov 25 04:52:27 2019 +0000

description:
Fix a bug that SK-9D41 can't detect fiber media. Check the subsystem ID
correctly. This bug was added in if_bge.c rev. 1.161.

diffstat:

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

diffs (27 lines):

diff -r 22c7e53452f7 -r 135c28a54b7f sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Mon Nov 25 00:54:47 2019 +0000
+++ b/sys/dev/pci/if_bge.c      Mon Nov 25 04:52:27 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.339 2019/11/10 21:16:36 chs Exp $ */
+/*     $NetBSD: if_bge.c,v 1.340 2019/11/25 04:52:27 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.339 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.340 2019/11/25 04:52:27 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3847,7 +3847,7 @@
         * by its PCI subsystem ID, as we do below for the SysKonnect SK-9D41.
         * The SysKonnect SK-9D41 is a 1000baseSX card.
         */
-       if (PCI_PRODUCT(pa->pa_id) == SK_SUBSYSID_9D41 ||
+       if (PCI_PRODUCT(subid) == SK_SUBSYSID_9D41 ||
            (hwcfg & BGE_HWCFG_MEDIA) == BGE_MEDIA_FIBER) {
                if (BGE_IS_5705_PLUS(sc)) {
                        sc->bge_flags |= BGEF_FIBER_MII;