Module Name: src
Committed By: snj
Date: Thu Jul 9 19:35:56 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5-0]: ip_output.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #847):
sys/netinet/ip_output.c: revision 1.203
>From Wolfgang Stukenbrock in PR kern/41659: add missing splx().
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.200.10.1 src/sys/netinet/ip_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.200 src/sys/netinet/ip_output.c:1.200.10.1
--- src/sys/netinet/ip_output.c:1.200 Sun Oct 12 11:15:54 2008
+++ src/sys/netinet/ip_output.c Thu Jul 9 19:35:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.200 2008/10/12 11:15:54 plunky Exp $ */
+/* $NetBSD: ip_output.c,v 1.200.10.1 2009/07/09 19:35:56 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.200 2008/10/12 11:15:54 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.200.10.1 2009/07/09 19:35:56 snj Exp $");
#include "opt_pfil_hooks.h"
#include "opt_inet.h"
@@ -671,8 +671,10 @@
if (!ipsec_outdone(m)) {
s = splsoftnet();
if (inp != NULL &&
- IPSEC_PCB_SKIP_IPSEC(inp->inp_sp, IPSEC_DIR_OUTBOUND))
+ IPSEC_PCB_SKIP_IPSEC(inp->inp_sp, IPSEC_DIR_OUTBOUND)) {
+ splx(s);
goto spd_done;
+ }
sp = ipsec4_checkpolicy(m, IPSEC_DIR_OUTBOUND, flags,
&error, inp);
/*
