splimp -> splnet

5 files changed, 22 insertions, 22 deletions

diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index fa3c5355d04..84993437ffe 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.43 2005/10/25 15:49:37 jmc Exp $	*/
+/*	$OpenBSD: an.c,v 1.44 2005/11/09 05:50:25 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -429,7 +429,7 @@ an_stats_update(xsc)
 	struct ifnet		*ifp = &ic->ic_if;
 	int			s;
 
-	s = splimp();
+	s = splnet();
 
 	sc->an_status.an_type = AN_RID_STATUS;
 	sc->an_status.an_len = sizeof(struct an_ltv_status);
@@ -987,7 +987,7 @@ an_ioctl(ifp, command, data)
 	struct proc		*p = curproc;
 	struct ifaddr		*ifa = (struct ifaddr *)data;
 
-	s = splimp();
+	s = splnet();
 
 	sc = ifp->if_softc;
 	ifr = (struct ifreq *)data;
@@ -1131,7 +1131,7 @@ an_init(sc)
 	if (sc->an_gone)
 		return;
 
-	s = splimp();
+	s = splnet();
 
 	if (ifp->if_flags & IFF_RUNNING)
 		an_stop(sc);
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index a3e5ffddd89..65ee9fb9937 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midway.c,v 1.33 2004/09/23 17:45:16 brad Exp $	*/
+/*	$OpenBSD: midway.c,v 1.34 2005/11/09 05:50:25 brad Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -1240,7 +1240,7 @@ int on;
   slot = sc->rxvc2slot[vci];
   if ((sc->rxslot[slot].oth_flags & (ENOTHER_FREE|ENOTHER_DRAIN)) != 0)
     return(EINVAL);
-  s = splimp();		/* block out enintr() */
+  s = splnet();		/* block out enintr() */
   oldmode = EN_READ(sc, MID_VC(vci));
   newmode = MIDV_SETMODE(oldmode, MIDV_TRASH) & ~MIDV_INSERVICE;
   EN_WRITE(sc, MID_VC(vci), (newmode | (oldmode & MIDV_INSERVICE)));
@@ -1481,7 +1481,7 @@ int vc;
 
 /*
  * en_start: start transmitting the next packet that needs to go out
- * if there is one.    note that atm_output() has already splimp()'d us.
+ * if there is one.    note that atm_output() has already splnet()'d us.
  */
 
 STATIC void en_start(ifp)
diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index 9f8e0b19d14..cb48c8bb3ce 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdq_ifsubr.c,v 1.16 2005/06/08 17:03:00 henning Exp $	*/
+/*	$OpenBSD: pdq_ifsubr.c,v 1.17 2005/11/09 05:50:25 brad Exp $	*/
 /*	$NetBSD: pdq_ifsubr.c,v 1.5 1996/05/20 00:26:21 thorpej Exp $	*/
 
 /*-
@@ -259,7 +259,7 @@ pdq_ifioctl(
     pdq_softc_t *sc = (pdq_softc_t *) ((caddr_t) ifp - offsetof(pdq_softc_t, sc_arpcom.ac_if));
     int s, error = 0;
 
-    s = splimp();
+    s = splnet();
 
     switch (cmd) {
 	case SIOCSIFADDR: {
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);