[src/netbsd-1-5]: src/sys/netinet6 pullup (approved by releng-1-5)

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a255e761281
branches:  netbsd-1-5
changeset: 489125:3a255e761281
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Aug 16 14:14:17 2000 +0000

description:
pullup (approved by releng-1-5)
 > add missing splx, when outgoing interface queue is full on tunnelled
 > IPsec packet output.  KAME PR 280.
 > cvs rdiff -r1.17 -r1.18 syssrc/sys/netinet6/ah_input.c
 > cvs rdiff -r1.4 -r1.5 syssrc/sys/netinet6/esp_input.c

diffstat:

 sys/netinet6/ah_input.c  |  4 +++-
 sys/netinet6/esp_input.c |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 6159cd7970e6 -r 3a255e761281 sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c   Wed Aug 16 01:23:21 2000 +0000
+++ b/sys/netinet6/ah_input.c   Wed Aug 16 14:14:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_input.c,v 1.15.2.2 2000/08/15 21:49:53 thorpej Exp $        */
+/*     $NetBSD: ah_input.c,v 1.15.2.3 2000/08/16 14:14:17 itojun Exp $ */
 /*     $KAME: ah_input.c,v 1.30 2000/07/15 16:07:48 itojun Exp $       */
 
 /*
@@ -458,6 +458,7 @@
                s = splimp();
                if (IF_QFULL(&ipintrq)) {
                        ipsecstat.in_inval++;
+                       splx(s);
                        goto fail;
                }
                IF_ENQUEUE(&ipintrq, m);
@@ -862,6 +863,7 @@
                s = splimp();
                if (IF_QFULL(&ip6intrq)) {
                        ipsec6stat.in_inval++;
+                       splx(s);
                        goto fail;
                }
                IF_ENQUEUE(&ip6intrq, m);
diff -r 6159cd7970e6 -r 3a255e761281 sys/netinet6/esp_input.c
--- a/sys/netinet6/esp_input.c  Wed Aug 16 01:23:21 2000 +0000
+++ b/sys/netinet6/esp_input.c  Wed Aug 16 14:14:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_input.c,v 1.1.1.1.2.2 2000/07/30 05:38:49 itojun Exp $     */
+/*     $NetBSD: esp_input.c,v 1.1.1.1.2.3 2000/08/16 14:14:17 itojun Exp $     */
 /*     $KAME: esp_input.c,v 1.28 2000/07/30 04:28:55 itojun Exp $      */
 
 /*
@@ -395,6 +395,7 @@
                s = splimp();
                if (IF_QFULL(&ipintrq)) {
                        ipsecstat.in_inval++;
+                       splx(s);
                        goto bad;
                }
                IF_ENQUEUE(&ipintrq, m);
@@ -761,6 +762,7 @@
                s = splimp();
                if (IF_QFULL(&ip6intrq)) {
                        ipsec6stat.in_inval++;
+                       splx(s);
                        goto bad;
                }
                IF_ENQUEUE(&ip6intrq, m);