splimp -> splnet

ok marco@

3 files changed, 26 insertions, 26 deletions

diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 3a367f66706..9ca7996aab3 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.125 2005/11/28 00:17:14 jsg Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.126 2005/12/03 21:11:47 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -128,7 +128,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.125 2005/11/28 00:17:14 jsg Exp $";
+	"$OpenBSD: if_wi.c,v 1.126 2005/12/03 21:11:47 brad Exp $";
 #endif	/* lint */
 
 #ifdef foo
@@ -875,7 +875,7 @@ wi_inquire(void *xsc)
 	if (ifp->if_flags & IFF_OACTIVE)
 		return;
 
-	s = splimp();
+	s = splnet();
 	rv = wi_cmd(sc, WI_CMD_INQUIRE, WI_INFO_COUNTERS, 0, 0);
 	splx(s);
 	if (rv)
@@ -1550,7 +1550,7 @@ wi_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	struct ifaddr		*ifa = (struct ifaddr *)data;
 	struct ieee80211_nwid	nwid;
 
-	s = splimp();
+	s = splnet();
 
 	sc = ifp->if_softc;
 	ifr = (struct ifreq *)data;
@@ -1893,7 +1893,7 @@ wi_init_io(struct wi_softc *sc)
 
 	DPRINTF(WID_INIT, ("wi_init: sc %p\n", sc));
 
-	s = splimp();
+	s = splnet();
 
 	if (ifp->if_flags & IFF_RUNNING)
 		wi_stop(sc);
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index a18b2b4039a..cc0b387b75b 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.32 2005/10/31 05:37:13 jsg Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.33 2005/12/03 21:11:48 brad Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -183,7 +183,7 @@ put_rates(caddr_t *ppkt, u_int16_t rates)
 /* wihap_init()
  *
  *	Initialize host AP data structures.  Called even if port type is
- *	not AP.  Caller MUST raise to splimp().
+ *	not AP.  Caller MUST raise to splnet().
  */
 void
 wihap_init(struct wi_softc *sc)
@@ -285,7 +285,7 @@ wihap_shutdown(struct wi_softc *sc)
 		return;
 	whi->apflags = 0;
 
-	s = splimp();
+	s = splnet();
 
 	/* Disable wihap inactivity timer. */
 	timeout_del(&whi->tmo);
@@ -352,7 +352,7 @@ wihap_timeout(void *v)
 	struct wihap_sta_info	*sta, *next;
 	int	i, s;
 
-	s = splimp();
+	s = splnet();
 
 	for (i = 10, sta = TAILQ_FIRST(&whi->sta_list);
 	    i != 0 && sta != TAILQ_END(&whi->sta_list) &&
@@ -412,7 +412,7 @@ wihap_sta_timeout(void *v)
 	struct wihap_info	*whi = &sc->wi_hostap_info;
 	int	s;
 
-	s = splimp();
+	s = splnet();
 
 	/* Mark sta as dead and move it to the head of the list. */
 	TAILQ_REMOVE(&whi->sta_list, sta, list);
@@ -428,7 +428,7 @@ wihap_sta_timeout(void *v)
 
 /* wihap_sta_delete()
  * Delete a single station and free up its data structure.
- * Caller must raise to splimp().
+ * Caller must raise to splnet().
  */
 void
 wihap_sta_delete(struct wihap_sta_info *sta)
@@ -611,7 +611,7 @@ wihap_auth_req(struct wi_softc *sc, struct wi_frame *rxfrm,
 			printf("wihap_auth_req: new station\n");
 
 		/* Create new station. */
-		s = splimp();
+		s = splnet();
 		sta = wihap_sta_alloc(sc, rxfrm->wi_addr2);
 		splx(s);
 		if (sta == NULL) {
@@ -1218,7 +1218,7 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
 			break;
 		if ((error = copyin(ifr->ifr_data, &reqsta, sizeof(reqsta))))
 			break;
-		s = splimp();
+		s = splnet();
 		sta = wihap_sta_find(whi, reqsta.addr);
 		if (sta == NULL)
 			error = ENOENT;
@@ -1240,7 +1240,7 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
 	case SIOCHOSTAP_GET:
 		if ((error = copyin(ifr->ifr_data, &reqsta, sizeof(reqsta))))
 			break;
-		s = splimp();
+		s = splnet();
 		sta = wihap_sta_find(whi, reqsta.addr);
 		if (sta == NULL)
 			error = ENOENT;
@@ -1262,7 +1262,7 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
 			break;
 		if ((error = copyin(ifr->ifr_data, &reqsta, sizeof(reqsta))))
 			break;
-		s = splimp();
+		s = splnet();
 		sta = wihap_sta_find(whi, reqsta.addr);
 		if (sta != NULL) {
 			error = EEXIST;
@@ -1301,7 +1301,7 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
 
 		reqall.nstations = whi->n_stations;
 		n = 0;
-		s = splimp();
+		s = splnet();
 		sta = TAILQ_FIRST(&whi->sta_list);
 		while (sta && reqall.size >= n+sizeof(struct hostap_sta)) {
 
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 3ffca66ed3f..c1395cbe94d 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.25 2005/11/24 14:31:40 grange Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.26 2005/12/03 21:11:48 brad Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1702,7 +1702,7 @@ wi_start_usb(struct ifnet *ifp)
 	wsc = ifp->if_softc;
 	sc  = wsc->wi_usb_cdata;
 
-	s = splimp();
+	s = splnet();
 
 	DPRINTFN(5,("%s: %s:\n",
 	    USBDEVNAME(sc->wi_usb_dev), __func__));
@@ -1748,7 +1748,7 @@ wi_inquire_usb(void *xsc)
 	int s;
 
 
-	s = splimp();
+	s = splnet();
 
 	DPRINTFN(2,("%s: %s:\n",
 	    USBDEVNAME(sc->wi_usb_dev), __func__));
@@ -1775,7 +1775,7 @@ wi_watchdog_usb(struct ifnet *ifp)
 	wsc = ifp->if_softc;
 	sc = wsc->wi_usb_cdata;
 
-	s = splimp();
+	s = splnet();
 
 	DPRINTFN(5,("%s: %s: ifp %x\n",
 	    USBDEVNAME(sc->wi_usb_dev), __func__, ifp));
@@ -1873,7 +1873,7 @@ wi_usb_thread(void *arg)
 		wi_usb_ctl_unlock(sc);
 
 		if (wi_thread_info->status == 0) {
-			s = splimp();
+			s = splnet();
 			wi_thread_info->idle = 1;
 			tsleep(wi_thread_info, PRIBIO, "wiIDL", 0);
 			wi_thread_info->idle = 0;
@@ -1887,7 +1887,7 @@ wi_usb_tx_lock_try(struct wi_usb_softc *sc)
 {
 	int s;
 
-	s = splimp(); /* right priority? */
+	s = splnet();
 
 	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->wi_usb_dev), __func__));
 
@@ -1906,7 +1906,7 @@ wi_usb_tx_lock(struct wi_usb_softc *sc)
 {
 	int s;
 
-	s = splimp(); /* right priority? */
+	s = splnet();
 
 	again:
 	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->wi_usb_dev), __func__));
@@ -1932,7 +1932,7 @@ void
 wi_usb_tx_unlock(struct wi_usb_softc *sc)
 {
 	int s;
-	s = splimp(); /* right priority? */
+	s = splnet();
 
 	sc->wi_lock = 0;
 
@@ -1953,7 +1953,7 @@ wi_usb_ctl_lock(struct wi_usb_softc *sc)
 {
 	int s;
 
-	s = splimp(); /* right priority? */
+	s = splnet();
 
 	again:
 	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->wi_usb_dev),
@@ -1988,7 +1988,7 @@ wi_usb_ctl_unlock(struct wi_usb_softc *sc)
 {
 	int s;
 
-	s = splimp(); /* right priority? */
+	s = splnet();
 
 	sc->wi_ctllock--;