Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys s/splnet/splsoftnet/ in IPv6/IPsec part.
details: https://anonhg.NetBSD.org/src/rev/5ae7eba119b0
branches: trunk
changeset: 474342:5ae7eba119b0
user: itojun <itojun%NetBSD.org@localhost>
date: Sun Jul 04 02:01:15 1999 +0000
description:
s/splnet/splsoftnet/ in IPv6/IPsec part.
hope I made no mistake (the kernel works fine but I need a regress test)
Suggested by: thorpej
diffstat:
sys/netinet6/ah_core.c | 6 +++---
sys/netinet6/frag6.c | 4 ++--
sys/netinet6/in6.c | 6 +++---
sys/netinet6/in6_pcb.c | 4 ++--
sys/netinet6/ip6_mroute.c | 24 ++++++++++++------------
sys/netinet6/ipsec.c | 10 +++++-----
sys/netinet6/mld6.c | 6 +++---
sys/netinet6/nd6.c | 18 +++++++++---------
sys/netinet6/nd6_nbr.c | 6 +++---
sys/netinet6/nd6_rtr.c | 16 ++++++++--------
sys/netinet6/raw_ip6.c | 4 ++--
sys/netinet6/udp6_usrreq.c | 14 +++++++-------
sys/netkey/key.c | 10 +++++-----
sys/netkey/keysock.c | 8 ++++----
14 files changed, 68 insertions(+), 68 deletions(-)
diffs (truncated from 599 to 300 lines):
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/ah_core.c
--- a/sys/netinet6/ah_core.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/ah_core.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_core.c,v 1.3 1999/07/03 21:30:17 thorpej Exp $ */
+/* $NetBSD: ah_core.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -870,7 +870,7 @@
p = mtod(m, u_char *);
- s = splnet(); /*XXX crypt algorithms need splnet() */
+ s = splsoftnet(); /*XXX crypt algorithms need splsoftnet() */
(algo->init)(&algos, sa);
advancewidth = 0; /*safety*/
@@ -1084,7 +1084,7 @@
p = mtod(m, u_char *);
- s = splnet(); /*XXX crypt algorithms need splnet() */
+ s = splsoftnet(); /*XXX crypt algorithms need splsoftnet() */
(algo->init)(&algos, sa);
advancewidth = 0; /*safety*/
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/frag6.c
--- a/sys/netinet6/frag6.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/frag6.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.3 1999/07/03 21:30:17 thorpej Exp $ */
+/* $NetBSD: frag6.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -537,7 +537,7 @@
frag6_slowtimo()
{
struct ip6q *q6;
- int s = splnet();
+ int s = splsoftnet();
#if 0
extern struct route_in6 ip6_forward_rt;
#endif
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/in6.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.3 1999/07/03 21:30:18 thorpej Exp $ */
+/* $NetBSD: in6.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1281,7 +1281,7 @@
struct in6_ifaddr *ia;
struct in6_ifreq ifr;
struct in6_multi *in6m;
- int s = splnet();
+ int s = splsoftnet();
*errorp = 0;
/*
@@ -1356,7 +1356,7 @@
struct in6_multi *in6m;
{
struct in6_ifreq ifr;
- int s = splnet();
+ int s = splsoftnet();
if (--in6m->in6m_refcount == 0) {
/*
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/in6_pcb.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.5 1999/07/03 21:30:18 thorpej Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.6 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -723,7 +723,7 @@
* 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.
*/
int
in6_pcbnotify(head, dst, fport_arg, laddr6, lport_arg, cmd, notify)
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/ip6_mroute.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.3 1999/07/03 21:30:18 thorpej Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -298,7 +298,7 @@
register struct mf6c *rt;
int s;
- s = splnet();
+ s = splsoftnet();
MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt);
splx(s);
if (rt != NULL) {
@@ -423,7 +423,7 @@
struct rtdetq *rte;
int s;
- s = splnet();
+ s = splsoftnet();
/*
* For each phyint in use, disable promiscuous reception of all IPv6
@@ -556,14 +556,14 @@
*/
ifr.ifr_addr.sin6_family = AF_INET6;
ifr.ifr_addr.sin6_addr = in6addr_any;
- s = splnet();
+ s = splsoftnet();
error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
splx(s);
if (error)
return error;
}
- s = splnet();
+ s = splsoftnet();
mifp->m6_flags = mifcp->mif6c_flags;
mifp->m6_ifp = ifp;
#ifdef notyet
@@ -610,7 +610,7 @@
if (mifp->m6_ifp == NULL)
return EINVAL;
- s = splnet();
+ s = splsoftnet();
if (!(mifp->m6_flags & MIFF_REGISTER)) {
/*
@@ -671,7 +671,7 @@
mfccp->mf6cc_parent);
#endif
- s = splnet();
+ s = splsoftnet();
rt->mf6c_parent = mfccp->mf6cc_parent;
rt->mf6c_ifset = mfccp->mf6cc_ifset;
splx(s);
@@ -681,7 +681,7 @@
/*
* Find the entry for which the upcall was made and update
*/
- s = splnet();
+ s = splsoftnet();
hash = MF6CHASH(mfccp->mf6cc_origin.sin6_addr,
mfccp->mf6cc_mcastgrp.sin6_addr);
for (rt = mf6ctable[hash], nstl = 0; rt; rt = rt->mf6c_next) {
@@ -849,7 +849,7 @@
ip6_sprintf(&mcastgrp.sin6_addr));
#endif
- s = splnet();
+ s = splsoftnet();
nptr = &mf6ctable[hash];
while ((rt = *nptr) != NULL) {
@@ -942,7 +942,7 @@
/*
* Determine forwarding mifs from the forwarding cache table
*/
- s = splnet();
+ s = splsoftnet();
MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt);
/* Entry exists, so forward if necessary */
@@ -1127,7 +1127,7 @@
int i;
int s;
- s = splnet();
+ s = splsoftnet();
for (i = 0; i < MF6CTBLSIZ; i++) {
if (nexpire[i] == 0)
continue;
@@ -1301,7 +1301,7 @@
register struct mbuf *mb_copy;
struct ifnet *ifp = mifp->m6_ifp;
int error = 0;
- int s = splnet();
+ int s = splsoftnet();
static struct route_in6 ro6;
struct in6_multi *in6m;
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/ipsec.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.3 1999/07/03 21:30:19 thorpej Exp $ */
+/* $NetBSD: ipsec.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -2128,9 +2128,9 @@
/*
* There may be the case that SA status will be changed when
- * we are refering to one. So calling splnet().
+ * we are refering to one. So calling splsoftnet().
*/
- s = splnet();
+ s = splsoftnet();
if (isr->mode == IPSEC_MODE_TUNNEL && isr->proxy) {
/*
@@ -2472,9 +2472,9 @@
/*
* There may be the case that SA status will be changed when
- * we are refering to one. So calling splnet().
+ * we are refering to one. So calling splsoftnet().
*/
- s = splnet();
+ s = splsoftnet();
if (isr->mode == IPSEC_MODE_TUNNEL && isr->proxy) {
/*
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/mld6.c
--- a/sys/netinet6/mld6.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/mld6.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.3 1999/07/03 21:30:19 thorpej Exp $ */
+/* $NetBSD: mld6.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -137,7 +137,7 @@
mld6_start_listening(in6m)
struct in6_multi *in6m;
{
- int s = splnet();
+ int s = splsoftnet();
/*
* (draft-ietf-ipngwg-mld, page 10)
@@ -335,7 +335,7 @@
if (!mld6_timers_are_running)
return;
- s = splnet();
+ s = splsoftnet();
mld6_timers_are_running = 0;
IN6_FIRST_MULTI(step, in6m);
while (in6m != NULL) {
diff -r ff935ff565d7 -r 5ae7eba119b0 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c Sun Jul 04 01:36:12 1999 +0000
+++ b/sys/netinet6/nd6.c Sun Jul 04 02:01:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.4 1999/07/03 21:30:19 thorpej Exp $ */
+/* $NetBSD: nd6.c,v 1.5 1999/07/04 02:01:15 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -375,7 +375,7 @@
register struct nd_defrouter *dr;
register struct nd_prefix *pr;
- s = splnet();
+ s = splsoftnet();
timeout(nd6_timer, (caddr_t)0, nd6_prune * hz);
ln = llinfo_nd6.ln_next;
@@ -636,7 +636,7 @@
int s;
in6 = &((struct sockaddr_in6 *)rt_key(rt))->sin6_addr;
- s = splnet();
+ s = splsoftnet();
dr = defrouter_lookup(&((struct sockaddr_in6 *)rt_key(rt))->
sin6_addr,
rt->rt_ifp);
@@ -1046,7 +1046,7 @@
switch (cmd) {
case SIOCGDRLST_IN6:
bzero(drl, sizeof(*drl));
- s = splnet();
+ s = splsoftnet();
dr = nd_defrouter.lh_first;
while (dr && i < DRLSTSIZ) {
drl->defrouter[i].rtaddr = dr->rtaddr;
@@ -1071,7 +1071,7 @@
break;
case SIOCGPRLST_IN6:
bzero(prl, sizeof(*prl));
- s = splnet();
+ s = splsoftnet();
pr = nd_prefix.lh_first;
Home |
Main Index |
Thread Index |
Old Index