diff options
| author | wpaul <wpaul@FreeBSD.org> | 2000-08-07 17:03:20 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2000-08-07 17:03:20 +0000 |
| commit | 0555ebf648a4f9b2894ad9c78c23db9a39a95186 (patch) | |
| tree | 6790a234a07bf317efa09019f5d490d4d790fdce /sys/pci/if_dc.c | |
| parent | 4cc352512a9cd9c6d421fa054cf26a9bdec60d47 (diff) | |
| download | FreeBSD-src-0555ebf648a4f9b2894ad9c78c23db9a39a95186.zip FreeBSD-src-0555ebf648a4f9b2894ad9c78c23db9a39a95186.tar.gz | |
Close PR 20438. Make fix for preserving LED settings conditional on
presence Intel 21143 chip.
Diffstat (limited to 'sys/pci/if_dc.c')
| -rw-r--r-- | sys/pci/if_dc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index 6699d83..f0f1608 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -1223,10 +1223,14 @@ static void dc_setcfg(sc, media) if (sc->dc_pmode == DC_PMODE_MII) { int watchdogreg; + if (DC_IS_INTEL(sc)) { /* there's a write enable bit here that reads as 1 */ - watchdogreg = CSR_READ_4(sc, DC_WATCHDOG); - watchdogreg &= ~DC_WDOG_CTLWREN; - watchdogreg |= DC_WDOG_JABBERDIS; + watchdogreg = CSR_READ_4(sc, DC_WATCHDOG); + watchdogreg &= ~DC_WDOG_CTLWREN; + watchdogreg |= DC_WDOG_JABBERDIS; + } else { + DC_SETBIT(sc, DC_WATCHDOG, DC_WDOG_JABBERDIS); + } DC_CLRBIT(sc, DC_NETCFG, (DC_NETCFG_PCS| DC_NETCFG_PORTSEL|DC_NETCFG_SCRAMBLER)); if (sc->dc_type == DC_TYPE_98713) |
