diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-11 11:51:31 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-11 11:51:31 +0000 |
| commit | 020852b670b8c7cf3a1c43443eff502149e57e6f (patch) | |
| tree | 8f5cbe8a24310e14a97008f206fe0f9eb5211a95 /sys/dev/pci/if_nfe.c | |
| parent | 0a6296e3f10983784bb11e90349ab00131567e52 (diff) | |
- call nfe_ifmedia_upd() early in nfe_init() to reset the PHY.
- set RX buffer size register properly
Diffstat (limited to 'sys/dev/pci/if_nfe.c')
| -rw-r--r-- | sys/dev/pci/if_nfe.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index e88808a7441..d3bcca02e13 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.27 2006/02/11 09:40:36 damien Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.28 2006/02/11 11:51:30 damien Exp $ */ /*- * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -957,6 +957,8 @@ nfe_init(struct ifnet *ifp) nfe_stop(ifp, 0); + nfe_ifmedia_upd(ifp); + NFE_WRITE(sc, NFE_TX_UNK, 0); rxtxctl = NFE_RXTX_BIT2; @@ -986,6 +988,8 @@ nfe_init(struct ifnet *ifp) (NFE_RX_RING_COUNT - 1) << 16 | (NFE_TX_RING_COUNT - 1)); + NFE_WRITE(sc, NFE_RXBUFSZ, MCLBYTES); + /* force MAC to wakeup */ tmp = NFE_READ(sc, NFE_PWR_STATE); NFE_WRITE(sc, NFE_PWR_STATE, tmp | NFE_PWR_WAKEUP); @@ -1005,9 +1009,6 @@ nfe_init(struct ifnet *ifp) DELAY(10); NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_BIT1 | rxtxctl); - /* configure media */ - mii_mediachg(&sc->sc_mii); - /* set Rx filter */ nfe_setmulti(sc); |