Module Name: src
Committed By: knakahara
Date: Mon Jul 4 04:32:55 UTC 2016
Modified Files:
src/sys/netinet: ip_encap.c
Log Message:
remove extra pserialize_perform()
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 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.57 src/sys/netinet/ip_encap.c:1.58
--- src/sys/netinet/ip_encap.c:1.57 Mon Jul 4 04:31:04 2016
+++ src/sys/netinet/ip_encap.c Mon Jul 4 04:32:55 2016
@@ -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 @@ 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) {
