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

couple of missing splx. sync with kame. 

From: csapuntz@play-doh.stanford.edu (Constantine Sapuntzakis)
This commit is contained in:
itojun 2001-03-25 09:06:03 +00:00
parent 5b36d84a9c
commit 0c8d8ae7a0
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet6/in6_prefix.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: in6_prefix.c,v 1.14 2001/02/10 04:14:27 itojun Exp $ */
/* $KAME: in6_prefix.c,v 1.29 2000/06/07 05:59:38 itojun Exp $ */
/* $NetBSD: in6_prefix.c,v 1.15 2001/03/25 09:06:03 itojun Exp $ */
/* $KAME: in6_prefix.c,v 1.47 2001/03/25 08:41:39 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -950,8 +950,10 @@ delete_each_prefix(struct rr_prefix *rpp, u_char origin)
s = splsoftnet();
rap = LIST_FIRST(&rpp->rp_addrhead);
if (rap == NULL)
if (rap == NULL) {
splx(s);
break;
}
LIST_REMOVE(rap, ra_entry);
splx(s);
if (rap->ra_addr == NULL) {

17
sys/netinet6/ip6_mroute.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: ip6_mroute.c,v 1.19 2001/03/08 10:48:40 itojun Exp $ */
/* $KAME: ip6_mroute.c,v 1.42 2001/03/08 08:27:48 jinmei Exp $ */
/* $NetBSD: ip6_mroute.c,v 1.20 2001/03/25 09:06:03 itojun Exp $ */
/* $KAME: ip6_mroute.c,v 1.45 2001/03/25 08:38:51 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@ -1485,28 +1485,25 @@ phyint_send(ip6, mifp, m)
log(LOG_DEBUG, "phyint_send on mif %d err %d\n",
mifp - mif6table, error);
#endif
}
else {
} else {
#ifdef MULTICAST_PMTUD
icmp6_error(mb_copy, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu);
splx(s);
return;
#else
#ifdef MRT6DEBUG
if (mrt6debug & DEBUG_DEBUG_XMIT)
if (mrt6debug & DEBUG_XMIT)
log(LOG_DEBUG,
"phyint_send: packet too big on %s o %s g %s"
" size %d(discarded)\n",
ifp->if_xname,
if_name(ifp),
ip6_sprintf(&ip6->ip6_src),
ip6_sprintf(&ip6->ip6_dst),
mb_copy->m_pkthdr.len);
#endif /* MRT6DEBUG */
m_freem(mb_copy); /* simply discard the packet */
splx(s);
return;
#endif
}
splx(s);
}
static int