[src/netbsd-3-0]: src/sys/netinet Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/f4834b4f3611
branches:  netbsd-3-0
changeset: 579450:f4834b4f3611
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Sep 17 20:15:36 2007 +0000

description:
Pull up following revision(s) (requested by degroote in ticket #1840):
        sys/netinet/ip_input.c: revision 1.253
In some FAST_IPSEC, spl level is not restored correctly. Fix that.
Spotted by Wolfgang Stukenbrock in pr/36800

diffstat:

 sys/netinet/ip_input.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r c09b92053364 -r f4834b4f3611 sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Mon Sep 17 20:07:15 2007 +0000
+++ b/sys/netinet/ip_input.c    Mon Sep 17 20:15:36 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.212.2.2 2005/05/06 08:40:14 tron Exp $  */
+/*     $NetBSD: ip_input.c,v 1.212.2.2.2.1 2007/09/17 20:15:36 bouyer Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.212.2.2 2005/05/06 08:40:14 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.212.2.2.2.1 2007/09/17 20:15:36 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -1005,7 +1005,6 @@
                        /* XXX error stat??? */
                        error = EINVAL;
 DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/
-                       goto bad;
                }
                splx(s);
                if (error)