Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet pserialize_perform() is required *after* PSLIST_...



details:   https://anonhg.NetBSD.org/src/rev/339c0f1587a0
branches:  trunk
changeset: 819892:339c0f1587a0
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Dec 22 04:54:54 2016 +0000

description:
pserialize_perform() is required *after* PSLIST_WRITER_REMOVE.

diffstat:

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

diffs (31 lines):

diff -r 5daaa0ddd086 -r 339c0f1587a0 sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Thu Dec 22 03:46:51 2016 +0000
+++ b/sys/netinet/ip_encap.c    Thu Dec 22 04:54:54 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.c,v 1.61 2016/07/04 04:40:13 knakahara Exp $  */
+/*     $NetBSD: ip_encap.c,v 1.62 2016/12/22 04:54:54 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.61 2016/07/04 04:40:13 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.62 2016/12/22 04:54:54 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -966,12 +966,7 @@
        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