Module Name: src Committed By: martin Date: Wed Jul 1 14:47:55 UTC 2009
Modified Files: src/sys/netinet: ip_output.c Log Message: >From Wolfgang Stukenbrock in PR kern/41659: add missing splx(). To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 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.202 src/sys/netinet/ip_output.c:1.203 --- src/sys/netinet/ip_output.c:1.202 Wed May 6 21:41:59 2009 +++ src/sys/netinet/ip_output.c Wed Jul 1 14:47:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_output.c,v 1.202 2009/05/06 21:41:59 elad Exp $ */ +/* $NetBSD: ip_output.c,v 1.203 2009/07/01 14:47:54 martin 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.202 2009/05/06 21:41:59 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.203 2009/07/01 14:47:54 martin 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); /*