diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-02-04 05:20:48 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-02-04 05:20:48 +0000 |
| commit | f2de98e0c6dc58bd0af76c44e12d0e4f18ed851c (patch) | |
| tree | f107f61a44d59c6cf24b1096411d8f6f580e24d7 | |
| parent | 84b76516955fe867299456399e88480025c2c533 (diff) | |
Revert part of rev 1.329 that involved bringing in some code from FreeBSD
and part of it touched upon the link state handling for the BCM5700 B2
revision of chipset. The special casing of the BCM5700 B2 chipset for
link state handling is wrong and doesn't work. This special casing was
removed in rev 1.229.
ok naddy@
| -rw-r--r-- | sys/dev/pci/if_bge.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 559c58f3a96..9a2d06d5bc5 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.350 2014/02/01 01:51:27 brad Exp $ */ +/* $OpenBSD: if_bge.c,v 1.351 2014/02/04 05:20:47 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -2455,8 +2455,7 @@ bge_blockinit(struct bge_softc *sc) } mimode |= BGE_MIMODE_PHYADDR(sc->bge_phy_addr); CSR_WRITE_4(sc, BGE_MI_MODE, mimode); - if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5700 && - sc->bge_chipid != BGE_CHIPID_BCM5700_B2) + if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } |