Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Collapse identical switch cases.



details:   https://anonhg.NetBSD.org/src/rev/3714b09995bd
branches:  trunk
changeset: 750419:3714b09995bd
user:      elad <elad%NetBSD.org@localhost>
date:      Wed Dec 30 23:23:58 2009 +0000

description:
Collapse identical switch cases.

diffstat:

 sys/netinet6/ipsec.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r ad7c3fc4ba4b -r 3714b09995bd sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Wed Dec 30 22:37:40 2009 +0000
+++ b/sys/netinet6/ipsec.c      Wed Dec 30 23:23:58 2009 +0000
@@ -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));



Home | Main Index | Thread Index | Old Index