Module Name: src
Committed By: elad
Date: Wed Dec 30 23:23:58 UTC 2009
Modified Files:
src/sys/netinet6: ipsec.c
Log Message:
Collapse identical switch cases.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/netinet6/ipsec.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/netinet6/ipsec.c
diff -u src/sys/netinet6/ipsec.c:1.142 src/sys/netinet6/ipsec.c:1.143
--- src/sys/netinet6/ipsec.c:1.142 Thu May 7 21:51:47 2009
+++ src/sys/netinet6/ipsec.c Wed Dec 30 23:23:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.142 2009/05/07 21:51:47 elad Exp $ */
+/* $NetBSD: ipsec.c,v 1.143 2009/12/30 23:23:58 elad Exp $ */
/* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.142 2009/05/07 21:51:47 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.143 2009/12/30 23:23:58 elad Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -482,6 +482,7 @@
if (pcbsp->priv) {
switch (currsp->policy) {
case IPSEC_POLICY_BYPASS:
+ case IPSEC_POLICY_IPSEC:
currsp->refcnt++;
*error = 0;
ipsec_fillpcbcache(pcbsp, m, currsp, dir);
@@ -506,12 +507,6 @@
ipsec_fillpcbcache(pcbsp, m, ip4_def_policy, dir);
return ip4_def_policy;
- case IPSEC_POLICY_IPSEC:
- currsp->refcnt++;
- *error = 0;
- ipsec_fillpcbcache(pcbsp, m, currsp, dir);
- return currsp;
-
default:
ipseclog((LOG_ERR, "ipsec4_getpolicybysock: "
"Invalid policy for PCB %d\n", currsp->policy));
