diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2013-04-07 03:22:06 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2013-04-07 03:22:06 +0000 |
| commit | a40995a22d95d3e4541f7f5256593fccb335ca7c (patch) | |
| tree | cb04b36704ba419f68323592aaafc08fb5330a2d /sys/dev | |
| parent | bb3ac4e71a7240835ddc3996401765872da9484a (diff) | |
check BGE_SGDIG_STS when the chip is NOT a 5717 A0, like freebsd.
found by david imhoff.
tested by david on a 5719 and by me on a 5720 and 5721
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 1dc1e4fd6e2..055ceec2d1f 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.326 2013/04/03 18:07:07 brad Exp $ */ +/* $OpenBSD: if_bge.c,v 1.327 2013/04/07 03:22:05 dlg Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -1594,7 +1594,7 @@ bge_phy_addr(struct bge_softc *sc) 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 { |