Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet remove extra pserialize_perform()



details:   https://anonhg.NetBSD.org/src/rev/7c46a1b4dc55
branches:  trunk
changeset: 346264:7c46a1b4dc55
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Jul 04 04:32:55 2016 +0000

description:
remove extra pserialize_perform()

diffstat:

 sys/netinet/ip_encap.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 0ef1e839f536 -r 7c46a1b4dc55 sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Mon Jul 04 04:31:04 2016 +0000
+++ b/sys/netinet/ip_encap.c    Mon Jul 04 04:32:55 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.c,v 1.57 2016/07/04 04:31:04 knakahara Exp $  */
+/*     $NetBSD: ip_encap.c,v 1.58 2016/07/04 04:32:55 knakahara Exp $  */
 /*     $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $       */
 
 /*
@@ -68,7 +68,7 @@
 #define USE_RADIX
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.57 2016/07/04 04:31:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.58 2016/07/04 04:32:55 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -945,8 +945,12 @@
        if (p == NULL)
                return ENOENT;
 
+#ifndef USE_RADIX
+       /*
+        * pserialize_perform(encaptab.psz) is already done in encap_remove().
+        */
        pserialize_perform(encaptab.psz);
-
+#endif
        psref_target_destroy(&p->psref,
            encaptab.elem_class);
        if (!ep->func) {



Home | Main Index | Thread Index | Old Index