diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-02 09:04:01 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-02 09:04:01 +0000 |
| commit | 01fc5d881036e0af6782fa72468afd189393f95f (patch) | |
| tree | 80a6150d113a9f493561e097f6e483729048f378 /sys/dev | |
| parent | 8aa2c4f426c153d2876e9dce604244b5c4b06db6 (diff) | |
Put the PHY update/reset call in nfe_init back to the spot it was at
before Rx/Tx/Interrupts are enabled.
This makes <fredd at cse.sc.edu>'s nfe+icsphy setup work again.
Tested on nfe+eephy by otto@ and myself, nfe+ciphy by otto@ and
nfe+rlphy by wilfried@
ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_nfe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 15aee85fa2d..bec5ec4070c 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.51 2006/02/26 19:25:41 damien Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.52 2006/03/02 09:04:00 jsg Exp $ */ /*- * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -1107,6 +1107,8 @@ nfe_init(struct ifnet *ifp) /* set Rx filter */ nfe_setmulti(sc); + nfe_ifmedia_upd(ifp); + /* enable Rx */ NFE_WRITE(sc, NFE_RX_CTL, NFE_RX_START); @@ -1118,8 +1120,6 @@ nfe_init(struct ifnet *ifp) /* enable interrupts */ NFE_WRITE(sc, NFE_IRQ_MASK, NFE_IRQ_WANTED); - nfe_ifmedia_upd(ifp); - timeout_add(&sc->sc_tick_ch, hz); ifp->if_flags |= IFF_RUNNING; |