diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-11-09 05:50:26 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-11-09 05:50:26 +0000 |
| commit | d35d3e0ea5084f6031afd40ed525cafe6a9ef5d3 (patch) | |
| tree | 672bba535fc335406cb021e3dd913bbaef1ac79c /sys/dev/ic | |
| parent | 9487bc03bd07e1fbc7c1110a4fdb796c9608eeab (diff) | |
splimp -> splnet
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/an.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/midway.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/pdq_ifsubr.c | 4 |
3 files changed, 9 insertions, 9 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: { |