Module Name: src
Committed By: knakahara
Date: Thu Dec 22 04:54:54 UTC 2016
Modified Files:
src/sys/netinet: ip_encap.c
Log Message:
pserialize_perform() is required *after* PSLIST_WRITER_REMOVE.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/netinet/ip_encap.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_encap.c
diff -u src/sys/netinet/ip_encap.c:1.61 src/sys/netinet/ip_encap.c:1.62
--- src/sys/netinet/ip_encap.c:1.61 Mon Jul 4 04:40:13 2016
+++ src/sys/netinet/ip_encap.c Thu Dec 22 04:54:54 2016
@@ -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 @@ encap_detach(const struct encaptab *cook
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) {
