Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci Check BGE_SGDIG_STS when the chip is NOT a 5717 ...



details:   https://anonhg.NetBSD.org/src/rev/9b2eb67909fe
branches:  trunk
changeset: 785971:9b2eb67909fe
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Apr 08 03:35:11 2013 +0000

description:
Check BGE_SGDIG_STS when the chip is NOT a 5717 A0, like freebsd
(OpenBSD rev. 1.327).

diffstat:

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

diffs (27 lines):

diff -r 2427f412ed94 -r 9b2eb67909fe sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Mon Apr 08 02:16:03 2013 +0000
+++ b/sys/dev/pci/if_bge.c      Mon Apr 08 03:35:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.233 2013/04/08 01:59:11 msaitoh Exp $     */
+/*     $NetBSD: if_bge.c,v 1.234 2013/04/08 03:35:11 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.233 2013/04/08 01:59:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.234 2013/04/08 03:35:11 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -2220,7 +2220,7 @@
        case BGE_ASICREV_BCM5719:
        case BGE_ASICREV_BCM5720:
                phy_addr = pa->pa_function;
-               if (sc->bge_chipid == BGE_CHIPID_BCM5717_A0) {
+               if (sc->bge_chipid != BGE_CHIPID_BCM5717_A0) {
                        phy_addr += (CSR_READ_4(sc, BGE_SGDIG_STS) &
                            BGE_SGDIGSTS_IS_SERDES) ? 8 : 1;
                } else {



Home | Main Index | Thread Index | Old Index