 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $	*/
+/*	$NetBSD: ip_encap.c,v 1.64 2017/04/15 17:06:45 riastradh Exp $	*/
 /*	$KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -58,27 +58,27 @@
 /* XXX is M_NETADDR correct? */
 /*
  * With USE_RADIX the code will use radix table for tunnel lookup, for
  * tunnels registered with encap_attach() with a addr/mask pair.
  * Faster on machines with thousands of tunnel registerations (= interfaces).
+ *
  * The code assumes that radix table code can handle non-continuous netmask,
  * as it will pass radix table memory region with (src + dst) sockaddr pair.
  */
 #define USE_RADIX
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.64 2017/04/15 17:06:45 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 @@ -264,28 +264,26 @@ encap4_lookup(struct mbuf *m, int off, i
 	if (rn && (rn->rn_flags & RNF_ROOT) == 0) {
 		struct encaptab *encapp = (struct encaptab *)rn;
 		psref_acquire(match_psref, &encapp->psref,
 		    encaptab.elem_class);
 		match = encapp;
 		matchprio = mask_matchlen(match->srcmask) +
 		    mask_matchlen(match->dstmask);
+	}
 #endif
 	PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
 		struct psref elem_psref;
 		membar_datadep_consumer();
 		if (ep->af != AF_INET)
 			continue;
 		if (ep->proto >= 0 && ep->proto != proto)
 			continue;
 		psref_acquire(&elem_psref, &ep->psref,
 		    encaptab.elem_class);
 		if (ep->func) {
 			pserialize_read_exit(s);
 			/* ep->func is sleepable. e.g. rtalloc1 */
 			prio = (*ep->func)(m, off, proto, ep->arg);
 			s = pserialize_read_enter();
 		} else {
 @@ -432,28 +430,26 @@ encap6_lookup(struct mbuf *m, int off, i
 	if (rn && (rn->rn_flags & RNF_ROOT) == 0) {
 		struct encaptab *encapp = (struct encaptab *)rn;
 		psref_acquire(match_psref, &encapp->psref,
 		    encaptab.elem_class);
 		match = encapp;
 		matchprio = mask_matchlen(match->srcmask) +
 		    mask_matchlen(match->dstmask);
+	}
 #endif
 	PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
 		struct psref elem_psref;
 		membar_datadep_consumer();
 		if (ep->af != AF_INET6)
 			continue;
 		if (ep->proto >= 0 && ep->proto != proto)
 			continue;
 		psref_acquire(&elem_psref, &ep->psref,
 		    encaptab.elem_class);
 		if (ep->func) {
 			pserialize_read_exit(s);
 			/* ep->func is sleepable. e.g. rtalloc1 */
 			prio = (*ep->func)(m, off, proto, ep->arg);
 			s = pserialize_read_enter();
 @@ -668,28 +664,26 @@ encap_attach(int af, int proto,
 #ifndef ENCAP_MPSAFE
 	int s;
 	s = splsoftnet();
 #endif
 	/* sanity check on args */
 	error = encap_afcheck(af, sp, dp);
 	if (error)
 		goto fail;
 	/* check if anyone have already attached with exactly same config */
 	pss = pserialize_read_enter();
 	PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
 		membar_datadep_consumer();
 		if (ep->af != af)
 			continue;
 		if (ep->proto != proto)
 			continue;
 		if (ep->func)
 			continue;
 		KASSERT(ep->src != NULL);
 		KASSERT(ep->dst != NULL);
 		KASSERT(ep->srcmask != NULL);
 		KASSERT(ep->dstmask != NULL);
 		if (ep->src->sa_len != sp->sa_len ||
 @@ -910,28 +904,26 @@ encap6_ctlinput(int cmd, const struct so
+		}
 	} else {
 		m = NULL;
 		ip6 = NULL;
 		nxt = -1;
+	}
 	/* inform all listeners */
 	s = pserialize_read_enter();
 	PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
 		struct psref elem_psref;
 		membar_datadep_consumer();
 		if (ep->af != AF_INET6)
 			continue;
 		if (ep->proto >= 0 && ep->proto != nxt)
 			continue;
 		/* should optimize by looking at address pairs */
 		/* XXX need to pass ep->arg or ep itself to listeners */
 		psref_acquire(&elem_psref, &ep->psref,
 		    encaptab.elem_class);
 		esw = ep->esw;
 		if (esw && esw->encapsw6.pr_ctlinput) {
 			pserialize_read_exit(s);
 @@ -949,28 +941,26 @@ encap6_ctlinput(int cmd, const struct so
+}
 #endif
 int
 encap_detach(const struct encaptab *cookie)
+{
 	const struct encaptab *ep = cookie;
 	struct encaptab *p;
 	int error;
 	KASSERT(encap_lock_held());
 	PSLIST_WRITER_FOREACH(p, &encap_table, struct encaptab, chain) {
 		membar_datadep_consumer();
 		if (p == ep) {
 			error = encap_remove(p);
 			if (error)
 				return error;
 			else
 				break;
+		}
+	}
 	if (p == NULL)
 		return ENOENT;
 	pserialize_perform(encaptab.psz);
 	psref_target_destroy(&p->psref,