Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

splnet --> splsoftnet

Browse Source
This commit is contained in:
mycroft 1995-08-12 23:59:09 +00:00
parent 8887de9230
commit 5482957905
35 changed files with 118 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/sys_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_socket.c,v 1.12 1994/10/30 21:47:52 cgd Exp $ */
/* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -141,7 +141,7 @@ soo_select(fp, which, p)
struct proc *p;
{
register struct socket *so = (struct socket *)fp->f_data;
register int s = splnet();
register int s = splsoftnet();
switch (which) {

26
sys/kern/uipc_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_socket.c,v 1.19 1995/05/23 00:19:30 cgd Exp $ */
/* $NetBSD: uipc_socket.c,v 1.20 1995/08/12 23:59:11 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
@ -106,7 +106,7 @@ sobind(so, nam)
struct socket *so;
struct mbuf *nam;
{
int s = splnet();
int s = splsoftnet();
int error;
error =
@ -121,7 +121,7 @@ solisten(so, backlog)
register struct socket *so;
int backlog;
{
int s = splnet(), error;
int s = splsoftnet(), error;
error =
(*so->so_proto->pr_usrreq)(so, PRU_LISTEN,
@ -165,7 +165,7 @@ int
soclose(so)
register struct socket *so;
{
int s = splnet(); /* conservative */
int s = splsoftnet(); /* conservative */
int error = 0;
if (so->so_options & SO_ACCEPTCONN) {
@ -210,7 +210,7 @@ discard:
}
/*
* Must be called at splnet...
* Must be called at splsoftnet...
*/
int
soabort(so)
@ -227,7 +227,7 @@ soaccept(so, nam)
register struct socket *so;
struct mbuf *nam;
{
int s = splnet();
int s = splsoftnet();
int error;
if ((so->so_state & SS_NOFDREF) == 0)
@ -249,7 +249,7 @@ soconnect(so, nam)
if (so->so_options & SO_ACCEPTCONN)
return (EOPNOTSUPP);
s = splnet();
s = splsoftnet();
/*
* If protocol is connection-based, can only connect once.
* Otherwise, if connected, try to disconnect first.
@ -272,7 +272,7 @@ soconnect2(so1, so2)
register struct socket *so1;
struct socket *so2;
{
int s = splnet();
int s = splsoftnet();
int error;
error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2,
@ -285,7 +285,7 @@ int
sodisconnect(so)
register struct socket *so;
{
int s = splnet();
int s = splsoftnet();
int error;
if ((so->so_state & SS_ISCONNECTED) == 0) {
@ -362,7 +362,7 @@ restart:
if (error = sblock(&so->so_snd, SBLOCKWAIT(flags)))
goto out;
do {
s = splnet();
s = splsoftnet();
if (so->so_state & SS_CANTSENDMORE)
snderr(EPIPE);
if (so->so_error)
@ -455,7 +455,7 @@ nopages:
} while (space > 0 && atomic);
if (dontroute)
so->so_options |= SO_DONTROUTE;
s = splnet(); /* XXX */
s = splsoftnet(); /* XXX */
error = (*so->so_proto->pr_usrreq)(so,
(flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
top, addr, control);
@ -547,7 +547,7 @@ bad:
restart:
if (error = sblock(&so->so_rcv, SBLOCKWAIT(flags)))
return (error);
s = splnet();
s = splsoftnet();
m = so->so_rcv.sb_mb;
/*
@ -698,7 +698,7 @@ dontblock:
if (mp == 0) {
splx(s);
error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
s = splnet();
s = splsoftnet();
} else
uio->uio_resid -= len;
if (len == m->m_len - moff) {

6
sys/kern/uipc_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_syscalls.c,v 1.13 1995/06/24 20:34:27 christos Exp $ */
/* $NetBSD: uipc_syscalls.c,v 1.14 1995/08/12 23:59:12 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@ -158,7 +158,7 @@ accept(p, uap, retval)
return (error);
if (error = getsock(p->p_fd, SCARG(uap, s), &fp))
return (error);
s = splnet();
s = splsoftnet();
so = (struct socket *)fp->f_data;
if ((so->so_options & SO_ACCEPTCONN) == 0) {
splx(s);
@ -247,7 +247,7 @@ connect(p, uap, retval)
m_freem(nam);
return (EINPROGRESS);
}
s = splnet();
s = splsoftnet();
while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)
if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
netcon, 0))

4
sys/miscfs/portal/portal_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: portal_vnops.c,v 1.12 1995/06/01 22:44:23 jtc Exp $ */
/* $NetBSD: portal_vnops.c,v 1.13 1995/08/12 23:59:15 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -265,7 +265,7 @@ portal_open(ap)
* will happen if the server dies. Sleep for 5 second intervals
* and keep polling the reference count. XXX.
*/
s = splnet();
s = splsoftnet();
while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
if (fmp->pm_server->f_count == 1) {
error = ECONNREFUSED;

4
sys/net/bpf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf.c,v 1.20 1995/07/23 16:29:47 mycroft Exp $ */
/* $NetBSD: bpf.c,v 1.21 1995/08/12 23:59:17 mycroft Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@ -544,7 +544,7 @@ bpfwrite(dev, uio)
if (m->m_pkthdr.len > ifp->if_mtu)
return (EMSGSIZE);
s = splnet();
s = splsoftnet();
#if BSD >= 199103
error = (*ifp->if_output)(ifp, m, &dst, (struct rtentry *)0);
#else

6
sys/net/if.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if.c,v 1.22 1995/06/12 02:22:13 mycroft Exp $ */
/* $NetBSD: if.c,v 1.23 1995/08/12 23:59:19 mycroft Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -318,7 +318,7 @@ link_rtrequest(cmd, rt, sa)
/*
* Mark an interface down and notify protocols of
* the transition.
* NOTE: must be called at splnet or eqivalent.
* NOTE: must be called at splsoftnet or equivalent.
*/
void
if_down(ifp)
@ -336,7 +336,7 @@ if_down(ifp)
/*
* Mark an interface up and notify protocols of
* the transition.
* NOTE: must be called at splnet or equivalent.
* NOTE: must be called at splsoftnet or equivalent.
*/
void
if_up(ifp)

7
sys/net/if_ppp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ppp.c,v 1.22 1995/07/04 06:28:20 paulus Exp $ */
/* $NetBSD: if_ppp.c,v 1.23 1995/08/12 23:59:21 mycroft Exp $ */
/*
* if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver.
@ -175,11 +175,6 @@ struct compressor *ppp_compressors[8] = {
};
#endif /* PPP_COMPRESS */
#ifndef splsoftnet
#define splsoftnet splnet /* some ports may not have this */
#endif
/*
* Called from boot code to establish ppp interfaces.
*/

4
sys/net/if_sl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sl.c,v 1.36 1995/06/13 05:31:00 mycroft Exp $ */
/* $NetBSD: if_sl.c,v 1.37 1995/08/12 23:59:22 mycroft Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@ -310,7 +310,7 @@ slclose(tp)
int s;
ttywflush(tp);
s = splimp(); /* actually, max(spltty, splnet) */
s = splimp(); /* actually, max(spltty, splsoftnet) */
tp->t_line = 0;
sc = (struct sl_softc *)tp->t_sc;
if (sc != NULL) {

4
sys/net/netisr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: netisr.h,v 1.11 1995/07/04 23:24:07 paulus Exp $ */
/* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */
/*
* Copyright (c) 1980, 1986, 1989, 1993
@ -38,7 +38,7 @@
/*
* The networking code runs off software interrupts.
*
* You can switch into the network by doing splnet() and return by splx().
* You can switch into the network by doing splsoftnet() and return by splx().
* The software interrupt level for the network is higher than the software
* level for the clock (so you can enter the network in routines called
* at timeout time).

8
sys/net/route.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: route.c,v 1.12 1995/03/08 02:57:11 cgd Exp $ */
/* $NetBSD: route.c,v 1.13 1995/08/12 23:59:25 mycroft Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@ -101,7 +101,7 @@ rtalloc1(dst, report)
register struct radix_node *rn;
struct rtentry *newrt = 0;
struct rt_addrinfo info;
int s = splnet(), err = 0, msgtype = RTM_MISS;
int s = splsoftnet(), err = 0, msgtype = RTM_MISS;
if (rnh && (rn = rnh->rnh_matchaddr((caddr_t)dst, rnh)) &&
((rn->rn_flags & RNF_ROOT) == 0)) {
@ -174,7 +174,7 @@ ifafree(ifa)
* Normally called as a result of a routing redirect
* message from the network layer.
*
* N.B.: must be called at splnet
* N.B.: must be called at splsoftnet
*/
int
rtredirect(dst, gateway, netmask, flags, src, rtp)
@ -330,7 +330,7 @@ rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
struct sockaddr *dst, *gateway, *netmask;
struct rtentry **ret_nrt;
{
int s = splnet(); int error = 0;
int s = splsoftnet(); int error = 0;
register struct rtentry *rt;
register struct radix_node *rn;
register struct radix_node_head *rnh;

6
sys/net/rtsock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtsock.c,v 1.13 1995/06/12 00:46:57 mycroft Exp $ */
/* $NetBSD: rtsock.c,v 1.14 1995/08/12 23:59:27 mycroft Exp $ */
/*
* Copyright (c) 1988, 1991, 1993
@ -99,7 +99,7 @@ route_usrreq(so, req, m, nam, control)
route_cb.iso_count--;
route_cb.any_count--;
}
s = splnet();
s = splsoftnet();
error = raw_usrreq(so, req, m, nam, control);
rp = sotorawcb(so);
if (req == PRU_ATTACH && rp) {
@ -786,7 +786,7 @@ sysctl_rtable(name, namelen, where, given, new, newlen)
w.w_op = name[1];
w.w_arg = name[2];
s = splnet();
s = splsoftnet();
switch (w.w_op) {
case NET_RT_DUMP:

4
sys/netinet/if_arp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_arp.c,v 1.26 1995/06/12 00:47:23 mycroft Exp $ */
/* $NetBSD: if_arp.c,v 1.27 1995/08/12 23:59:29 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@ -112,7 +112,7 @@ arptimer(arg)
int s;
register struct llinfo_arp *la, *nla;
s = splnet();
s = splsoftnet();
timeout(arptimer, NULL, arpt_prune * hz);
for (la = llinfo_arp.lh_first; la != 0; la = nla) {
register struct rtentry *rt = la->la_rt;

4
sys/netinet/if_ether.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ether.c,v 1.26 1995/06/12 00:47:23 mycroft Exp $ */
/* $NetBSD: if_ether.c,v 1.27 1995/08/12 23:59:29 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@ -112,7 +112,7 @@ arptimer(arg)
int s;
register struct llinfo_arp *la, *nla;
s = splnet();
s = splsoftnet();
timeout(arptimer, NULL, arpt_prune * hz);
for (la = llinfo_arp.lh_first; la != 0; la = nla) {
register struct rtentry *rt = la->la_rt;

8
sys/netinet/igmp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: igmp.c,v 1.13 1995/06/04 05:58:20 mycroft Exp $ */
/* $NetBSD: igmp.c,v 1.14 1995/08/12 23:59:31 mycroft Exp $ */
/*
* Internet Group Management Protocol (IGMP) routines.
@ -358,7 +358,7 @@ void
igmp_joingroup(inm)
struct in_multi *inm;
{
int s = splnet();
int s = splsoftnet();
inm->inm_state = IGMP_IDLE_MEMBER;
@ -408,7 +408,7 @@ igmp_fasttimo()
if (!igmp_timers_are_running)
return;
s = splnet();
s = splsoftnet();
igmp_timers_are_running = 0;
IN_FIRST_MULTI(step, inm);
while (inm != NULL) {
@ -438,7 +438,7 @@ igmp_slowtimo()
register struct router_info *rti;
int s;
s = splnet();
s = splsoftnet();
for (rti = rti_head; rti != 0; rti = rti->rti_next) {
if (rti->rti_type == IGMP_v1_ROUTER &&
++rti->rti_age >= IGMP_AGE_THRESHOLD) {

6
sys/netinet/in.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in.c,v 1.24 1995/06/12 00:47:29 mycroft Exp $ */
/* $NetBSD: in.c,v 1.25 1995/08/12 23:59:32 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1991, 1993
@ -466,7 +466,7 @@ in_addmulti(ap, ifp)
register struct in_multi *inm;
struct ifreq ifr;
struct in_ifaddr *ia;
int s = splnet();
int s = splsoftnet();
/*
* See if address already in list.
@ -530,7 +530,7 @@ in_delmulti(inm)
register struct in_multi *inm;
{
struct ifreq ifr;
int s = splnet();
int s = splsoftnet();
if (--inm->inm_refcount == 0) {
/*

4
sys/netinet/in_pcb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_pcb.c,v 1.21 1995/06/18 20:01:08 cgd Exp $ */
/* $NetBSD: in_pcb.c,v 1.22 1995/08/12 23:59:34 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1991, 1993
@ -351,7 +351,7 @@ in_setpeeraddr(inp, nam)
* Call the protocol specific routine (if any) to report
* any errors for each matching socket.
*
* Must be called at splnet.
* Must be called at splsoftnet.
*/
void
in_pcbnotify(table, dst, fport_arg, laddr, lport_arg, errno, notify)

4
sys/netinet/ip_input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_input.c,v 1.23 1995/06/12 06:46:36 mycroft Exp $ */
/* $NetBSD: ip_input.c,v 1.24 1995/08/12 23:59:36 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@ -594,7 +594,7 @@ void
ip_slowtimo()
{
register struct ipq *fp;
int s = splnet();
int s = splsoftnet();
fp = ipq.next;
if (fp == 0) {

36
sys/netinet/ip_mroute.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_mroute.c,v 1.23 1995/06/12 03:05:12 mycroft Exp $ */
/* $NetBSD: ip_mroute.c,v 1.24 1995/08/12 23:59:38 mycroft Exp $ */
/*
* IP multicast forwarding procedures
@ -336,7 +336,7 @@ get_sg_cnt(req)
register struct mfc *rt;
int s;
s = splnet();
s = splsoftnet();
MFCFIND(req->src.s_addr, req->grp.s_addr, rt);
splx(s);
if (rt != NULL) {
@ -424,7 +424,7 @@ ip_mrouter_done()
int i;
int s;
s = splnet();
s = splsoftnet();
/* Clear out all the vifs currently in use. */
for (vifi = 0; vifi < numvifs; vifi++) {
@ -575,7 +575,7 @@ add_vif(m)
return (error);
}
s = splnet();
s = splsoftnet();
/* Define parameters for the tbf structure. */
vifp->v_tbf.q_len = 0;
vifp->v_tbf.n_tok = 0;
@ -660,7 +660,7 @@ del_vif(m)
if (vifp->v_lcl_addr.s_addr == 0)
return (EADDRNOTAVAIL);
s = splnet();
s = splsoftnet();
reset_vif(vifp);
@ -730,7 +730,7 @@ add_mfc(m)
mfccp = mtod(m, struct mfcctl *);
s = splnet();
s = splsoftnet();
MFCFIND(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr, rt);
/* If an entry already exists, just update the fields */
@ -872,7 +872,7 @@ del_mfc(m)
log(LOG_DEBUG, "del_mfc origin %x mcastgrp %x",
ntohl(mfccp->mfcc_origin.s_addr), ntohl(mfccp->mfcc_mcastgrp.s_addr));
s = splnet();
s = splsoftnet();
MFCFIND(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr, rt);
if (rt == NULL) {
@ -993,7 +993,7 @@ ip_mforward(m, ifp)
/*
* Determine forwarding vifs from the forwarding cache table
*/
s = splnet();
s = splsoftnet();
MFCFIND(ip->ip_src.s_addr, ip->ip_dst.s_addr, rt);
/* Entry exists, so forward if necessary */
@ -1152,7 +1152,7 @@ expire_upcalls()
int i;
int s;
s = splnet();
s = splsoftnet();
for (i = 0; i < MFCTBLSIZ; i++) {
register struct mfc *rt, *nrt;
@ -1546,7 +1546,7 @@ tbf_queue(vifp, m, ip)
{
register u_int32_t ql;
register int index = (vifp - viftable);
register int s = splnet();
register int s = splsoftnet();
ql = vifp->v_tbf.q_len;
@ -1569,7 +1569,7 @@ tbf_process_q(vifp)
register struct mbuf *m;
register struct pkt_queue pkt_1;
register int index = (vifp - viftable);
register int s = splnet();
register int s = splsoftnet();
/* loop through the queue at the interface and send as many packets
* as possible
@ -1644,7 +1644,7 @@ tbf_dq_sel(vifp, ip)
register struct ip *ip;
{
register int i;
register int s = splnet();
register int s = splsoftnet();
register u_int p;
p = priority(vifp, ip);
@ -1669,7 +1669,7 @@ tbf_send_packet(vifp,m)
{
register struct mbuf *mcp;
int error;
int s = splnet();
int s = splsoftnet();
if (vifp->v_flags & VIFF_TUNNEL) {
/* If tunnel options */
@ -1705,7 +1705,7 @@ tbf_update_tokens(vifp)
struct timeval tp;
register u_int32_t t;
register u_int32_t elapsed;
register int s = splnet();
register int s = splsoftnet();
microtime(&tp);
@ -1794,7 +1794,7 @@ ip_rsvp_vif_init(so, m)
if (rsvpdebug)
printf("ip_rsvp_vif_init: vif = %d rsvp_on = %d\n",i,rsvp_on);
s = splnet();
s = splsoftnet();
/* Check vif. */
if (!legal_vif_num(i)) {
@ -1842,7 +1842,7 @@ ip_rsvp_vif_done(so, m)
}
i = *(mtod(m, int *));
s = splnet();
s = splsoftnet();
/* Check vif. */
if (!legal_vif_num(i)) {
@ -1877,7 +1877,7 @@ ip_rsvp_force_done(so)
if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
return;
s = splnet();
s = splsoftnet();
/* The socket may be attached to more than one vif...this
* is perfectly legal.
@ -1930,7 +1930,7 @@ rsvp_input(m, ifp)
return;
}
s = splnet();
s = splsoftnet();
if (rsvpdebug)
printf("rsvp_input: check vifs\n");

6
sys/netinet/tcp_timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_timer.c,v 1.12 1995/06/18 20:01:17 cgd Exp $ */
/* $NetBSD: tcp_timer.c,v 1.13 1995/08/12 23:59:39 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
@ -74,7 +74,7 @@ tcp_fasttimo()
register struct tcpcb *tp;
int s;
s = splnet();
s = splsoftnet();
inp = tcbtable.inpt_queue.cqh_first;
if (inp) /* XXX */
for (; inp != (struct inpcb *)&tcbtable.inpt_queue;
@ -103,7 +103,7 @@ tcp_slowtimo()
int s;
register long i;
s = splnet();
s = splsoftnet();
tcp_maxidle = TCPTV_KEEPCNT * tcp_keepintvl;
/*
* Search through tcb's and update active timers.

6
sys/netinet/tcp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_usrreq.c,v 1.15 1995/06/12 00:48:00 mycroft Exp $ */
/* $NetBSD: tcp_usrreq.c,v 1.16 1995/08/12 23:59:41 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@ -96,7 +96,7 @@ tcp_usrreq(so, req, m, nam, control)
return (EINVAL);
}
s = splnet();
s = splsoftnet();
inp = sotoinpcb(so);
/*
* When a TCP is attached to a socket, then there will be
@ -350,7 +350,7 @@ tcp_ctloutput(op, so, level, optname, mp)
register struct mbuf *m;
register int i;
s = splnet();
s = splsoftnet();
inp = sotoinpcb(so);
if (inp == NULL) {
splx(s);

14
sys/netinet/udp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udp_usrreq.c,v 1.23 1995/06/26 08:46:16 cgd Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.24 1995/08/12 23:59:42 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
@ -410,7 +410,7 @@ udp_output(inp, m, addr, control)
/*
* Must block input while temporarily connected.
*/
s = splnet();
s = splsoftnet();
error = in_pcbconnect(inp, addr);
if (error) {
splx(s);
@ -508,7 +508,7 @@ udp_usrreq(so, req, m, addr, control)
error = EINVAL;
break;
}
s = splnet();
s = splsoftnet();
error = in_pcballoc(so, &udbtable);
splx(s);
if (error)
@ -524,7 +524,7 @@ udp_usrreq(so, req, m, addr, control)
break;
case PRU_BIND:
s = splnet();
s = splsoftnet();
error = in_pcbbind(inp, addr);
splx(s);
break;
@ -538,7 +538,7 @@ udp_usrreq(so, req, m, addr, control)
error = EISCONN;
break;
}
s = splnet();
s = splsoftnet();
error = in_pcbconnect(inp, addr);
splx(s);
if (error == 0)
@ -558,7 +558,7 @@ udp_usrreq(so, req, m, addr, control)
error = ENOTCONN;
break;
}
s = splnet();
s = splsoftnet();
in_pcbdisconnect(inp);
inp->inp_laddr.s_addr = INADDR_ANY;
splx(s);
@ -621,7 +621,7 @@ static void
udp_detach(inp)
struct inpcb *inp;
{
int s = splnet();
int s = splsoftnet();
if (inp == udp_last_inpcb)
udp_last_inpcb = 0;

4
sys/netiso/clnp_timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clnp_timer.c,v 1.5 1994/06/29 06:39:24 cgd Exp $ */
/* $NetBSD: clnp_timer.c,v 1.6 1995/08/12 23:59:44 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -147,7 +147,7 @@ void
clnp_slowtimo()
{
register struct clnp_fragl *cfh = clnp_frags;
int s = splnet();
int s = splsoftnet();
while (cfh != NULL) {
if (--cfh->cfl_ttl == 0) {

4
sys/netiso/cltp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cltp_usrreq.c,v 1.7 1995/06/13 07:13:24 mycroft Exp $ */
/* $NetBSD: cltp_usrreq.c,v 1.8 1995/08/12 23:59:46 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@ -342,7 +342,7 @@ cltp_usrreq(so, req, m, nam, control)
/*
* Must block input while temporarily connected.
*/
s = splnet();
s = splsoftnet();
error = iso_pcbconnect(isop, nam);
if (error) {
splx(s);

4
sys/netiso/idrp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: idrp_usrreq.c,v 1.3 1995/06/13 07:13:26 mycroft Exp $ */
/* $NetBSD: idrp_usrreq.c,v 1.4 1995/08/12 23:59:47 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -109,7 +109,7 @@ idrp_output(m, addr)
struct mbuf *m, *addr;
{
register struct sockaddr_iso *siso = mtod(addr, struct sockaddr_iso *);
int s = splnet(), i;
int s = splsoftnet(), i;
bcopy((caddr_t)&(siso->siso_addr),
(caddr_t)&idrp_isop.isop_sfaddr.siso_addr, 1 + siso->siso_nlen);

4
sys/netiso/tp_inet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_inet.c,v 1.8 1995/06/13 07:13:40 mycroft Exp $ */
/* $NetBSD: tp_inet.c,v 1.9 1995/08/12 23:59:48 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -468,7 +468,7 @@ tpip_input(m, iplen)
{
struct sockaddr_in src, dst;
register struct ip *ip;
int s = splnet(), hdrlen;
int s = splsoftnet(), hdrlen;
IncStat(ts_pkt_rcvd);

4
sys/netiso/tp_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_output.c,v 1.7 1994/12/13 20:38:52 mycroft Exp $ */
/* $NetBSD: tp_output.c,v 1.8 1995/08/12 23:59:50 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -364,7 +364,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
struct mbuf **mp;
{
struct tp_pcb *tpcb = sototpcb(so);
int s = splnet();
int s = splsoftnet();
caddr_t value;
unsigned val_len;
int error = 0;

6
sys/netiso/tp_timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_timer.c,v 1.5 1994/06/29 06:40:38 cgd Exp $ */
/* $NetBSD: tp_timer.c,v 1.6 1995/08/12 23:59:51 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -185,7 +185,7 @@ tp_slowtimo()
register struct tp_ref *rp;
struct tp_pcb *tpcb;
struct tp_event E;
int s = splnet(), t;
int s = splsoftnet(), t;
/* check only open reference structures */
IncStat(ts_Cticks);
@ -270,7 +270,7 @@ void
tp_fasttimo()
{
register struct tp_pcb *t;
int s = splnet();
int s = splsoftnet();
struct tp_event E;
E.ev_number = TM_sendack;

4
sys/netiso/tp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_usrreq.c,v 1.6 1995/03/08 02:16:18 cgd Exp $ */
/* $NetBSD: tp_usrreq.c,v 1.7 1995/08/12 23:59:52 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -377,7 +377,7 @@ tp_usrreq(so, req, m, nam, controlp)
struct mbuf *m, *nam, *controlp;
{
register struct tp_pcb *tpcb = sototpcb(so);
int s = splnet();
int s = splsoftnet();
int error = 0;
int flags, *outflags = &flags;
u_long eotsdu = 0;

4
sys/netiso/tuba_table.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tuba_table.c,v 1.3 1994/09/20 06:41:40 cgd Exp $ */
/* $NetBSD: tuba_table.c,v 1.4 1995/08/12 23:59:53 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -60,7 +60,7 @@ extern int arpt_keep, arpt_prune; /* use same values as arp cache */
void
tuba_timer()
{
int s = splnet();
int s = splsoftnet();
int i;
register struct tuba_cache *tc;
long timelimit = time.tv_sec - arpt_keep;

4
sys/netiso/tuba_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tuba_usrreq.c,v 1.6 1995/07/12 09:17:06 cgd Exp $ */
/* $NetBSD: tuba_usrreq.c,v 1.7 1995/08/12 23:59:55 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -97,7 +97,7 @@ tuba_usrreq(so, req, m, nam, control)
return (iso_control(so, (long)m, (caddr_t)nam,
(struct ifnet *)control));
s = splnet();
s = splsoftnet();
inp = sotoinpcb(so);
/*
* When a TCP is attached to a socket, then there will be

4
sys/netns/idp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: idp_usrreq.c,v 1.7 1995/06/13 08:36:58 mycroft Exp $ */
/* $NetBSD: idp_usrreq.c,v 1.8 1995/08/12 23:59:56 mycroft Exp $ */
/*
* Copyright (c) 1984, 1985, 1986, 1987, 1993
@ -467,7 +467,7 @@ idp_usrreq(so, req, m, nam, control)
/*
* Must block input while temporarily connected.
*/
s = splnet();
s = splsoftnet();
error = ns_pcbconnect(nsp, nam);
if (error) {
splx(s);

8
sys/netns/spp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spp_usrreq.c,v 1.6 1995/03/08 02:14:56 cgd Exp $ */
/* $NetBSD: spp_usrreq.c,v 1.7 1995/08/12 23:59:58 mycroft Exp $ */
/*
* Copyright (c) 1984, 1985, 1986, 1987, 1993
@ -1263,7 +1263,7 @@ spp_usrreq(so, req, m, nam, controlp)
{
struct nspcb *nsp = sotonspcb(so);
register struct sppcb *cb;
int s = splnet();
int s = splsoftnet();
int error = 0, ostate;
struct mbuf *mm;
register struct sockbuf *sb;
@ -1639,7 +1639,7 @@ spp_fasttimo()
{
register struct nspcb *nsp;
register struct sppcb *cb;
int s = splnet();
int s = splsoftnet();
nsp = nspcb.nsp_next;
if (nsp)
@ -1663,7 +1663,7 @@ spp_slowtimo()
{
register struct nspcb *ip, *ipnxt;
register struct sppcb *cb;
int s = splnet();
int s = splsoftnet();
register long i;
/*

6
sys/nfs/nfs_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_socket.c,v 1.20 1995/06/02 19:50:11 mycroft Exp $ */
/* $NetBSD: nfs_socket.c,v 1.21 1995/08/13 00:00:01 mycroft Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@ -220,7 +220,7 @@ nfs_connect(nmp, rep)
* connect system call but with the wait timing out so
* that interruptible mounts don't hang here for a long time.
*/
s = splnet();
s = splsoftnet();
while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
(void) tsleep((caddr_t)&so->so_timeo, PSOCK,
"nfscon", 2 * hz);
@ -1181,7 +1181,7 @@ nfs_timer(arg)
static long lasttime = 0;
int s, error;
s = splnet();
s = splsoftnet();
for (rep = nfs_reqq.tqh_first; rep != 0; rep = rep->r_chain.tqe_next) {
nmp = rep->r_nmp;
if (rep->r_mrep || (rep->r_flags & R_SOFTTERM))

10
sys/nfs/nfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_syscalls.c,v 1.13 1994/10/20 04:28:10 cgd Exp $ */
/* $NetBSD: nfs_syscalls.c,v 1.14 1995/08/13 00:00:04 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@ -368,7 +368,7 @@ nfssvc_addsock(fp, mynam)
slp->ns_nam = mynam;
fp->f_count++;
slp->ns_fp = fp;
s = splnet();
s = splsoftnet();
so->so_upcallarg = (caddr_t)slp;
so->so_upcall = nfsrv_rcv;
slp->ns_flag = (SLP_VALID | SLP_NEEDQ);
@ -398,7 +398,7 @@ nfssvc_nfsd(nsd, argp, p)
int error, cacherep, s;
int sotype;
s = splnet();
s = splsoftnet();
if (nd == (struct nfsd *)0) {
nsd->nsd_nfsd = nd = (struct nfsd *)
malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK);
@ -608,7 +608,7 @@ nfssvc_nfsd(nsd, argp, p)
nfs_sndunlock(solockp);
if (error == EINTR || error == ERESTART) {
nfsrv_slpderef(slp);
s = splnet();
s = splsoftnet();
goto done;
}
break;
@ -619,7 +619,7 @@ nfssvc_nfsd(nsd, argp, p)
m_freem(nam2);
break;
};
s = splnet();
s = splsoftnet();
if (nfsrv_dorec(slp, nd)) {
nd->nd_flag &= ~NFSD_REQINPROG;
nd->nd_slp = (struct nfssvc_sock *)0;

4
sys/nfs/nfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vfsops.c,v 1.37 1995/06/18 14:48:04 cgd Exp $ */
/* $NetBSD: nfs_vfsops.c,v 1.38 1995/08/13 00:00:08 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@ -341,7 +341,7 @@ nfs_decode_args(nmp, argp)
int s;
int adjsock;
s = splnet();
s = splsoftnet();
/* Re-bind if rsrvd port requested and wasn't on one */
adjsock = !(nmp->nm_flag & NFSMNT_RESVPORT)