splimp -> splnet

10 files changed, 48 insertions, 48 deletions

diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 8447a7aa1a6..3ed233a2a5e 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990.c,v 1.38 2005/01/15 05:24:10 brad Exp $	*/
+/*	$OpenBSD: am7990.c,v 1.39 2005/11/07 03:20:00 brad Exp $	*/
 /*	$NetBSD: am7990.c,v 1.22 1996/10/13 01:37:19 christos Exp $	*/
 
 /*-
@@ -215,7 +215,7 @@ am7990_reset(sc)
 {
 	int s;
 
-	s = splimp();
+	s = splnet();
 	am7990_init(sc);
 	splx(s);
 }
@@ -742,7 +742,7 @@ am7990_watchdog(ifp)
  * Setup output on interface.
  * Get another datagram to send off of the interface queue, and map it to the
  * interface before starting the output.
- * Called only at splimp or interrupt level.
+ * Called only at splnet or interrupt level.
  */
 void
 am7990_start(ifp)
@@ -841,7 +841,7 @@ am7990_ioctl(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);
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 49df7d3d0bd..52b41e65ee1 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.88 2005/06/25 23:27:43 brad Exp $	*/
+/*	$OpenBSD: dc.c,v 1.89 2005/11/07 03:20:00 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -547,7 +547,7 @@ dc_mii_readreg(sc, frame)
 {
 	int i, ack, s;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Set up frame for RX.
@@ -619,7 +619,7 @@ dc_mii_writereg(sc, frame)
 {
 	int s;
 
-	s = splimp();
+	s = splnet();
 	/*
 	 * Set up frame for TX.
 	 */
@@ -2410,7 +2410,7 @@ dc_tick(xsc)
 	int s;
 	u_int32_t r;
 
-	s = splimp();
+	s = splnet();
 
 	ifp = &sc->sc_arpcom.ac_if;
 	mii = &sc->sc_mii;
@@ -2815,7 +2815,7 @@ dc_init(xsc)
 	struct mii_data *mii;
 	int s;
 
-	s = splimp();
+	s = splnet();
 
 	mii = &sc->sc_mii;
 
@@ -3058,7 +3058,7 @@ dc_ioctl(ifp, command, data)
 	struct mii_data		*mii;
 	int			s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command, data)) > 0) {
 		splx(s);
@@ -3254,7 +3254,7 @@ dc_power(why, arg)
 	struct ifnet *ifp;
 	int s;
 
-	s = splimp();
+	s = splnet();
 	if (why != PWR_RESUME)
 		dc_stop(sc);
 	else {
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 455f58dd119..f65d2ab082c 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.72 2005/06/08 17:02:59 henning Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.73 2005/11/07 03:20:00 brad Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -324,7 +324,7 @@ fxp_power(why, arg)
 	struct ifnet *ifp;
 	int s;
 
-	s = splimp();
+	s = splnet();
 	if (why != PWR_RESUME)
 		fxp_stop(sc, 0);
 	else {
@@ -1036,7 +1036,7 @@ fxp_stats_update(arg)
 		if (tx_threshold < 192)
 			tx_threshold += 64;
 	}
-	s = splimp();
+	s = splnet();
 	/*
 	 * If we haven't received any packets in FXP_MAX_RX_IDLE seconds,
 	 * then assume the receiver has locked up and attempt to clear
@@ -1153,7 +1153,7 @@ fxp_stop(sc, drain)
 		for (i = 0; i < FXP_NRFABUFS_MIN; i++) {
 			if (fxp_add_rfabuf(sc, NULL) != 0) {
 				/*
-				 * This "can't happen" - we're at splimp()
+				 * This "can't happen" - we're at splnet()
 				 * and we just freed all the buffers we need
 				 * above.
 				 */
@@ -1205,7 +1205,7 @@ fxp_init(xsc)
 	bus_dmamap_t rxmap;
 	int i, prm, save_bf, lrxen, allm, s, bufs;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Cancel any pending I/O
@@ -1669,7 +1669,7 @@ fxp_ioctl(ifp, command, data)
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command, data)) > 0) {
 		splx(s);
@@ -1754,7 +1754,7 @@ fxp_ioctl(ifp, command, data)
  * of it. We then can do 'CU_START' on the mcsetup descriptor and have it
  * lead into the regular TxCB ring when it completes.
  *
- * This function must be called at splimp.
+ * This function must be called at splnet.
  */
 void
 fxp_mc_setup(sc, doit)
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index fbd38bac50d..5a5bcd4eb4a 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.50 2005/11/02 02:15:12 brad Exp $	*/
+/*	$OpenBSD: gem.c,v 1.51 2005/11/07 03:20:00 brad Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -389,7 +389,7 @@ gem_tick(arg)
 	bus_space_write_4(t, mac, GEM_MAC_EXCESS_COLL_CNT, 0);
 	bus_space_write_4(t, mac, GEM_MAC_LATE_COLL_CNT, 0);
 
-	s = splimp();
+	s = splnet();
 	mii_tick(&sc->sc_mii);
 	splx(s);
 
@@ -423,7 +423,7 @@ gem_reset(sc)
 	bus_space_handle_t h = sc->sc_h;
 	int s;
 
-	s = splimp();
+	s = splnet();
 	DPRINTF(sc, ("%s: gem_reset\n", sc->sc_dev.dv_xname));
 	gem_reset_rx(sc);
 	gem_reset_tx(sc);
@@ -694,7 +694,7 @@ gem_init(struct ifnet *ifp)
 	u_int max_frame_size;
 	u_int32_t v;
 
-	s = splimp();
+	s = splnet();
 
 	DPRINTF(sc, ("%s: gem_init: calling stop\n", sc->sc_dev.dv_xname));
 	/*
@@ -1354,7 +1354,7 @@ gem_ioctl(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);
diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index aeb1c4ffad7..60473af0b07 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xx.c,v 1.9 2005/07/02 22:04:54 brad Exp $	*/
+/*	$OpenBSD: mtd8xx.c,v 1.10 2005/11/07 03:20:00 brad Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -582,7 +582,7 @@ mtd_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error;
 
-	s = splimp();
+	s = splnet();
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command, data)) > 0) {
 		splx(s);
 		return (error);
@@ -652,7 +652,7 @@ mtd_init(struct ifnet *ifp)
 	struct mtd_softc *sc = ifp->if_softc;
 	int s;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Cancel pending I/O and free all RX/TX buffers.
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index e66e5963c8a..8cfa345c681 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.14 2005/08/01 17:00:23 pvalchev Exp $	*/
+/*	$OpenBSD: re.c,v 1.15 2005/11/07 03:20:00 brad Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -359,7 +359,7 @@ re_miibus_readreg(struct device *dev, int phy, int reg)
 	u_int16_t		re8139_reg = 0;
 	int			s;
 
-	s = splimp();
+	s = splnet();
 
 	if (sc->rl_type == RL_8169) {
 		rval = re_gmii_readreg(dev, phy, reg);
@@ -419,7 +419,7 @@ re_miibus_writereg(struct device *dev, int phy, int reg, int data)
 	u_int16_t		re8139_reg = 0;
 	int			s;
 
-	s = splimp();
+	s = splnet();
 
 	if (sc->rl_type == RL_8169) {
 		re_gmii_writereg(dev, phy, reg, data);
@@ -1577,7 +1577,7 @@ re_init(struct ifnet *ifp)
 	u_int32_t		reg;
 	int			s;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Cancel pending I/O and free all RX/TX buffers.
@@ -1765,7 +1765,7 @@ re_ioctl(ifp, command, data)
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	int			s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command,
 	    data)) > 0) {
diff --git a/sys/dev/ic/rln.c b/sys/dev/ic/rln.c
index bc727c079c9..1ce30d87060 100644
--- a/sys/dev/ic/rln.c
+++ b/sys/dev/ic/rln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rln.c,v 1.16 2004/05/12 06:35:10 tedu Exp $	*/
+/*	$OpenBSD: rln.c,v 1.17 2005/11/07 03:20:00 brad Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public Domain.
  *
@@ -237,7 +237,7 @@ rlnstart(ifp)
 	rln_enable(sc, 1);
 
     startagain:
-	s = splimp();
+	s = splnet();
 	IFQ_DEQUEUE(&ifp->if_snd, m0);
 	splx(s);
 
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index bce8f2f210b..18bbaf88f1f 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.46 2005/10/24 00:35:57 brad Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.47 2005/11/07 03:20:00 brad Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -326,7 +326,7 @@ int rl_mii_readreg(sc, frame)
 {
 	int			i, ack, s;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Set up frame for RX.
@@ -418,7 +418,7 @@ int rl_mii_writereg(sc, frame)
 {
 	int			s;
 
-	s = splimp();
+	s = splnet();
 	/*
 	 * Set up frame for TX.
 	 */
@@ -964,7 +964,7 @@ void rl_init(xsc)
 	int			s;
 	u_int32_t		rxcfg = 0;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Cancel pending I/O and free all RX/TX buffers.
@@ -1088,7 +1088,7 @@ int rl_ioctl(ifp, command, data)
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	int			s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command, data)) > 0) {
 		splx(s);
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index a31ad610d79..ad3433d60c4 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tropic.c,v 1.9 2005/06/08 17:03:00 henning Exp $	*/
+/*	$OpenBSD: tropic.c,v 1.10 2005/11/07 03:20:00 brad Exp $	*/
 /*	$NetBSD: tropic.c,v 1.6 1999/12/17 08:26:31 fvdl Exp $	*/
 
 /* 
@@ -622,7 +622,7 @@ tr_init(arg)
 	if ((ifp->if_flags & IFF_RUNNING) != 0)
 		return;
 
-	s = splimp();
+	s = splnet();
 
 	ifp->if_flags &= ~IFF_OACTIVE;
 	sc->sc_xmit_head = sc->sc_xmit_tail = 0; /* XXX tr_reset() */
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index aafa07fd4f6..d048e64d971 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.65 2005/07/02 23:10:16 brad Exp $	*/
+/*	$OpenBSD: xl.c,v 1.66 2005/11/07 03:20:00 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -209,7 +209,7 @@ xl_power(why, arg)
 	struct ifnet *ifp;
 	int s;
 
-	s = splimp();
+	s = splnet();
 	if (why != PWR_RESUME)
 		xl_stop(sc);
 	else {
@@ -324,7 +324,7 @@ xl_mii_readreg(sc, frame)
 {
 	int			i, ack, s;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Set up frame for RX.
@@ -412,7 +412,7 @@ xl_mii_writereg(sc, frame)
 {
 	int			s;
 
-	s = splimp();
+	s = splnet();
 	/*
 	 * Set up frame for TX.
 	 */
@@ -2051,7 +2051,7 @@ xl_init(xsc)
 	u_int16_t		rxfilt = 0;
 	struct mii_data		*mii = NULL;
 
-	s = splimp();
+	s = splnet();
 
 	/*
 	 * Cancel pending I/O and free all RX/TX buffers.
@@ -2395,7 +2395,7 @@ xl_ioctl(ifp, command, data)
 	struct mii_data *mii = NULL;
 	u_int8_t rxfilt;
 
-	s = splimp();
+	s = splnet();
 
 	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, command, data)) > 0) {
 		splx(s);
@@ -2623,7 +2623,7 @@ xl_attach(sc)
 	int i, media = IFM_ETHER|IFM_100_TX|IFM_FDX;
 	struct ifmedia *ifm;
 
-	i = splimp();
+	i = splnet();
 	xl_reset(sc);
 	splx(i);
 
@@ -2793,7 +2793,7 @@ xl_attach(sc)
 	 */
 	if (sc->xl_xcvr == XL_XCVR_AUTO) {
 		xl_choose_xcvr(sc, 0);
-		i = splimp();
+		i = splnet();
 		xl_reset(sc);
 		splx(i);
 	}