diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-11-09 05:46:22 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-11-09 05:46:22 +0000 |
| commit | 9487bc03bd07e1fbc7c1110a4fdb796c9608eeab (patch) | |
| tree | ed5298cfdbd9d5c9473be8d022e3ab2c16e2d7f3 | |
| parent | e62a1e82344b9b420359d9bb653030d18f5807c2 (diff) | |
splimp -> splnet
| -rw-r--r-- | sys/dev/isa/if_ef_isapnp.c | 14 | ||||
| -rw-r--r-- | sys/dev/isa/if_ex.c | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c index 5e92e611478..49fb365dd79 100644 --- a/sys/dev/isa/if_ef_isapnp.c +++ b/sys/dev/isa/if_ef_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ef_isapnp.c,v 1.18 2005/01/15 05:24:11 brad Exp $ */ +/* $OpenBSD: if_ef_isapnp.c,v 1.19 2005/11/09 05:46:21 brad Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -344,7 +344,7 @@ efioctl(ifp, cmd, data) struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; - s = splimp(); + s = splnet(); if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { splx(s); @@ -413,7 +413,7 @@ efinit(sc) bus_space_handle_t ioh = sc->sc_ioh; int i, s; - s = splimp(); + s = splnet(); efstop(sc); @@ -854,7 +854,7 @@ ef_miibus_readreg(dev, phy, reg) struct ef_softc *sc = (struct ef_softc *)dev; int i, ack, s, val = 0; - s = splimp(); + s = splnet(); GO_WINDOW(4); bus_space_write_2(sc->sc_iot, sc->sc_ioh, EP_W4_CTRLR_STATUS, 0); @@ -927,7 +927,7 @@ ef_miibus_writereg(dev, phy, reg, val) struct ef_softc *sc = (struct ef_softc *)dev; int s, i; - s = splimp(); + s = splnet(); GO_WINDOW(4); bus_space_write_2(sc->sc_iot, sc->sc_ioh, EP_W4_CTRLR_STATUS, 0); @@ -986,7 +986,7 @@ ef_miibus_statchg(self) struct ef_softc *sc = (struct ef_softc *)self; int s; - s = splimp(); + s = splnet(); GO_WINDOW(3); /* Set duplex bit appropriately */ if ((sc->sc_mii.mii_media_active & IFM_GMASK) == IFM_FDX) @@ -1006,7 +1006,7 @@ ef_tick(v) struct ef_softc *sc = v; int s; - s = splimp(); + s = splnet(); mii_tick(&sc->sc_mii); splx(s); timeout_add(&sc->sc_tick_tmo, hz); diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c index ac69f10ac3f..ff2bdfb5217 100644 --- a/sys/dev/isa/if_ex.c +++ b/sys/dev/isa/if_ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ex.c,v 1.13 2005/06/08 17:03:00 henning Exp $ */ +/* $OpenBSD: if_ex.c,v 1.14 2005/11/09 05:46:21 brad Exp $ */ /* * Copyright (c) 1997, Donald A. Schmidt * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es) @@ -323,7 +323,7 @@ ex_init(sc) if (TAILQ_EMPTY(&ifp->if_addrlist)) return; - s = splimp(); + s = splnet(); sc->arpcom.ac_if.if_timer = 0; /* @@ -413,7 +413,7 @@ ex_start(ifp) DODEBUG(Start_End, printf("ex_start: start\n");); - s = splimp(); + s = splnet(); /* * Main loop: send outgoing packets to network card until there are no @@ -451,7 +451,7 @@ ex_start(ifp) /* * Disable rx and tx interrupts, to avoid corruption of * the host address register by interrupt service - * routines. XXX Is this necessary with splimp() + * routines. XXX Is this necessary with splnet() * enabled? */ ISA_WRITE(MASK_REG, All_Int); @@ -784,7 +784,7 @@ ex_ioctl(ifp, cmd, data) DODEBUG(Start_End, printf("ex_ioctl: start ");); - s = splimp(); + s = splnet(); switch(cmd) { case SIOCSIFADDR: @@ -885,7 +885,7 @@ ex_reset(sc) DODEBUG(Start_End, printf("ex_reset: start\n");); - s = splimp(); + s = splnet(); ex_stop(sc); ex_init(sc); splx(s); |