diff options
author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-03-25 09:25:09 +0000 |
---|---|---|
committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-03-25 09:25:09 +0000 |
commit | dadc3b6ce73fa4d671ad856e25e7277b0c1bf769 (patch) | |
tree | 7712ef9c3919ee17a104672e7df079f2c3ef2750 | |
parent | acf7b9f3213348f0f175c44947c33ff4303d0ec9 (diff) |
missing splx. sync with kame.
From: csapuntz@play-doh.stanford.edu (Constantine Sapuntzakis)
-rw-r--r-- | sys/netinet6/ip6_mroute.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index e7f7a5a0724..dcdd24683b7 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ip6_mroute.c,v 1.14 2001/03/08 09:01:31 itojun Exp $ */ -/* $KAME: ip6_mroute.c,v 1.43 2001/03/08 08:47:33 itojun Exp $ */ +/* $OpenBSD: ip6_mroute.c,v 1.15 2001/03/25 09:25:08 itojun Exp $ */ +/* $KAME: ip6_mroute.c,v 1.45 2001/03/25 08:38:51 itojun Exp $ */ /* * Copyright (C) 1998 WIDE Project. @@ -1507,12 +1507,9 @@ 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_XMIT) @@ -1525,10 +1522,10 @@ phyint_send(ip6, mifp, m) mb_copy->m_pkthdr.len); #endif /* MRT6DEBUG */ m_freem(mb_copy); /* simply discard the packet */ - splx(s); - return; #endif } + + splx(s); } static int |