diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-03-04 22:40:17 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-03-04 22:40:17 +0000 |
| commit | b751ff7496fc73fe22ed7d0c2371837c4c2aed2c (patch) | |
| tree | bd1ae2cb58e37d25f97c0e7f581ad0b9035bf683 /sys/netnatm/natm.c | |
| parent | 15e7a983128283f9a61840e1ed37255bb4ada6fe (diff) | |
With the exception of two other small uncommited diffs this moves
the remainder of the network stack from splimp to splnet.
ok miod@
Diffstat (limited to 'sys/netnatm/natm.c')
| -rw-r--r-- | sys/netnatm/natm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index e3f6a5f8f88..8022034e207 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: natm.c,v 1.6 2001/05/16 12:54:08 ho Exp $ */ +/* $OpenBSD: natm.c,v 1.7 2006/03/04 22:40:16 brad Exp $ */ /* * @@ -188,7 +188,7 @@ struct proc *p; ATM_PH_VPI(&api.aph) = npcb->npcb_vpi; ATM_PH_SETVCI(&api.aph, npcb->npcb_vci); api.rxhand = npcb; - s2 = splimp(); + s2 = splnet(); if (ifp->if_ioctl == NULL || ifp->if_ioctl(ifp, SIOCATMENA, (caddr_t) &api) != 0) { splx(s2); @@ -219,7 +219,7 @@ struct proc *p; ATM_PH_VPI(&api.aph) = npcb->npcb_vpi; ATM_PH_SETVCI(&api.aph, npcb->npcb_vci); api.rxhand = npcb; - s2 = splimp(); + s2 = splnet(); if (ifp->if_ioctl != NULL) ifp->if_ioctl(ifp, SIOCATMDIS, (caddr_t) &api); splx(s); @@ -347,7 +347,7 @@ natmintr() struct natmpcb *npcb; next: - s = splimp(); + s = splnet(); IF_DEQUEUE(&natmintrq, m); splx(s); if (m == NULL) @@ -361,7 +361,7 @@ next: npcb = (struct natmpcb *) m->m_pkthdr.rcvif; /* XXX: overloaded */ so = npcb->npcb_socket; - s = splimp(); /* could have atm devs @ different levels */ + s = splnet(); /* could have atm devs @ different levels */ npcb->npcb_inq--; splx(s); |