 @@ -1,14 +1,14 @@
-#	$NetBSD: mi,v 1.2237 2018/10/28 00:44:37 uwe Exp $
+#	$NetBSD: mi,v 1.2238 2018/11/15 10:06:06 maxv Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
 ./usr/bin/addr2line				comp-debug-bin		binutils
 ./usr/bin/ar					comp-util-bin		binutils
 ./usr/bin/as					comp-util-bin		binutils
 ./usr/bin/asa					comp-fortran-bin
 ./usr/bin/atf-compile				comp-obsolete		obsolete
 ./usr/bin/c++					comp-cxx-bin		gcccmds
 ./usr/bin/c++filt				comp-cxx-bin		binutils
 ./usr/bin/c11					comp-c-bin
 ./usr/bin/c89					comp-c-bin
 ./usr/bin/c99					comp-c-bin
 @@ -11225,33 +11225,33 @@
 ./usr/share/man/cat9/m_get.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/m_getclr.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/m_gethdr.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/m_makewritable.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_prepend.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_pulldown.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_pullup.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/m_split.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_copy.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_copy_chain.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_delete.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_delete_chain.0	comp-sys-catman		.cat
-./usr/share/man/cat9/m_tag_delete_nonpersistent.0	comp-sys-catman		.cat
+./usr/share/man/cat9/m_tag_delete_nonpersistent.0	comp-obsolete		obsolete
 ./usr/share/man/cat9/m_tag_find.0		comp-sys-catman		.cat
-./usr/share/man/cat9/m_tag_first.0		comp-sys-catman		.cat
+./usr/share/man/cat9/m_tag_first.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/m_tag_free.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_get.0		comp-sys-catman		.cat
-./usr/share/man/cat9/m_tag_init.0		comp-sys-catman		.cat
+./usr/share/man/cat9/m_tag_init.0		comp-obsolete		obsolete
-./usr/share/man/cat9/m_tag_next.0		comp-sys-catman		.cat
+./usr/share/man/cat9/m_tag_next.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/m_tag_prepend.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/m_tag_unlink.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/makeiplcookie.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/malloc.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/malloc_roundup.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/malloc_type_attach.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/malloc_type_detach.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/malloc_type_setlimit.0	comp-obsolete		obsolete
 ./usr/share/man/cat9/mb.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/mb_memory.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/mb_read.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/mb_write.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/mbuf.0			comp-sys-catman		.cat
 @@ -19038,33 +19038,33 @@
 ./usr/share/man/html9/m_get.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_getclr.html		comp-obsolete	obsolete
 ./usr/share/man/html9/m_gethdr.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_makewritable.html	comp-sys-htmlman	html
 ./usr/share/man/html9/m_prepend.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_pulldown.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_pullup.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_split.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_copy.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_copy_chain.html	comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_delete.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_delete_chain.html	comp-sys-htmlman	html
-./usr/share/man/html9/m_tag_delete_nonpersistent.html	comp-sys-htmlman	html
+./usr/share/man/html9/m_tag_delete_nonpersistent.html	comp-obsolete	obsolete
 ./usr/share/man/html9/m_tag_find.html		comp-sys-htmlman	html
-./usr/share/man/html9/m_tag_first.html		comp-sys-htmlman	html
+./usr/share/man/html9/m_tag_first.html		comp-obsolete	obsolete
 ./usr/share/man/html9/m_tag_free.html		comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_get.html		comp-sys-htmlman	html
-./usr/share/man/html9/m_tag_init.html		comp-sys-htmlman	html
+./usr/share/man/html9/m_tag_init.html		comp-obsolete	obsolete
-./usr/share/man/html9/m_tag_next.html		comp-sys-htmlman	html
+./usr/share/man/html9/m_tag_next.html		comp-obsolete	obsolete
 ./usr/share/man/html9/m_tag_prepend.html	comp-sys-htmlman	html
 ./usr/share/man/html9/m_tag_unlink.html		comp-sys-htmlman	html
 ./usr/share/man/html9/makeiplcookie.html	comp-sys-htmlman	html
 ./usr/share/man/html9/malloc.html		comp-sys-htmlman	html
 ./usr/share/man/html9/malloc_roundup.html	comp-obsolete	obsolete
 ./usr/share/man/html9/malloc_type_attach.html	comp-sys-htmlman	html
 ./usr/share/man/html9/malloc_type_detach.html	comp-sys-htmlman	html
 ./usr/share/man/html9/malloc_type_setlimit.html comp-obsolete	obsolete
 ./usr/share/man/html9/mb.html			comp-sys-htmlman	html
 ./usr/share/man/html9/mb_memory.html		comp-sys-htmlman	html
 ./usr/share/man/html9/mb_read.html		comp-sys-htmlman	html
 ./usr/share/man/html9/mb_write.html		comp-sys-htmlman	html
 ./usr/share/man/html9/mbuf.html			comp-sys-htmlman	html
 @@ -27005,33 +27005,33 @@
 ./usr/share/man/man9/m_get.9			comp-sys-man		.man
 ./usr/share/man/man9/m_getclr.9			comp-obsolete		obsolete
 ./usr/share/man/man9/m_gethdr.9			comp-sys-man		.man
 ./usr/share/man/man9/m_makewritable.9		comp-sys-man		.man
 ./usr/share/man/man9/m_prepend.9		comp-sys-man		.man
 ./usr/share/man/man9/m_pulldown.9		comp-sys-man		.man
 ./usr/share/man/man9/m_pullup.9			comp-sys-man		.man
 ./usr/share/man/man9/m_split.9			comp-sys-man		.man
 ./usr/share/man/man9/m_tag.9			comp-sys-man		.man
 ./usr/share/man/man9/m_tag_copy.9		comp-sys-man		.man
 ./usr/share/man/man9/m_tag_copy_chain.9		comp-sys-man		.man
 ./usr/share/man/man9/m_tag_delete.9		comp-sys-man		.man
 ./usr/share/man/man9/m_tag_delete_chain.9	comp-sys-man		.man
-./usr/share/man/man9/m_tag_delete_nonpersistent.9	comp-sys-man		.man
+./usr/share/man/man9/m_tag_delete_nonpersistent.9	comp-obsolete		obsolete
 ./usr/share/man/man9/m_tag_find.9		comp-sys-man		.man
-./usr/share/man/man9/m_tag_first.9		comp-sys-man		.man
+./usr/share/man/man9/m_tag_first.9		comp-obsolete		obsolete
 ./usr/share/man/man9/m_tag_free.9		comp-sys-man		.man
 ./usr/share/man/man9/m_tag_get.9		comp-sys-man		.man
-./usr/share/man/man9/m_tag_init.9		comp-sys-man		.man
+./usr/share/man/man9/m_tag_init.9		comp-obsolete		obsolete
-./usr/share/man/man9/m_tag_next.9		comp-sys-man		.man
+./usr/share/man/man9/m_tag_next.9		comp-obsolete		obsolete
 ./usr/share/man/man9/m_tag_prepend.9		comp-sys-man		.man
 ./usr/share/man/man9/m_tag_unlink.9		comp-sys-man		.man
 ./usr/share/man/man9/makeiplcookie.9		comp-sys-man		.man
 ./usr/share/man/man9/malloc.9			comp-sys-man		.man
 ./usr/share/man/man9/malloc_roundup.9		comp-obsolete		obsolete
 ./usr/share/man/man9/malloc_type_attach.9	comp-sys-man		.man
 ./usr/share/man/man9/malloc_type_detach.9	comp-sys-man		.man
 ./usr/share/man/man9/malloc_type_setlimit.9	comp-obsolete		obsolete
 ./usr/share/man/man9/mb.9			comp-sys-man		.man
 ./usr/share/man/man9/mb_memory.9		comp-sys-man		.man
 ./usr/share/man/man9/mb_read.9			comp-sys-man		.man
 ./usr/share/man/man9/mb_write.9			comp-sys-man		.man
 ./usr/share/man/man9/mbuf.9			comp-sys-man		.man

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.221 2018/11/15 09:38:57 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.222 2018/11/15 10:06:07 maxv Exp $	*/
 /*
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_mbuf.c	8.4 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.221 2018/11/15 09:38:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.222 2018/11/15 10:06:07 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
 #include "ether.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 @@ -1711,51 +1711,53 @@ m_defrag(struct mbuf *m, int how)
 	} while (sz > 0);
 	m_freem(m->m_next);
 	m->m_next = m0;
 	return m;
+}
 void
 m_remove_pkthdr(struct mbuf *m)
+{
 	KASSERT(m->m_flags & M_PKTHDR);
-	m_tag_delete_chain(m, NULL);
+	m_tag_delete_chain(m);
 	m->m_flags &= ~M_PKTHDR;
 	memset(&m->m_pkthdr, 0, sizeof(m->m_pkthdr));
+}
 void
 m_copy_pkthdr(struct mbuf *to, struct mbuf *from)
+{
 	KASSERT((to->m_flags & M_EXT) == 0);
-	KASSERT((to->m_flags & M_PKTHDR) == 0 || m_tag_first(to) == NULL);
+	KASSERT((to->m_flags & M_PKTHDR) == 0 ||
 	    SLIST_FIRST(&to->m_pkthdr.tags) == NULL);
 	KASSERT((from->m_flags & M_PKTHDR) != 0);
 	to->m_pkthdr = from->m_pkthdr;
 	to->m_flags = from->m_flags & M_COPYFLAGS;
 	to->m_data = to->m_pktdat;
 	SLIST_INIT(&to->m_pkthdr.tags);
 	m_tag_copy_chain(to, from);
+}
 void
 m_move_pkthdr(struct mbuf *to, struct mbuf *from)
+{
 	KASSERT((to->m_flags & M_EXT) == 0);
-	KASSERT((to->m_flags & M_PKTHDR) == 0 || m_tag_first(to) == NULL);
+	KASSERT((to->m_flags & M_PKTHDR) == 0 ||
 	    SLIST_FIRST(&to->m_pkthdr.tags) == NULL);
 	KASSERT((from->m_flags & M_PKTHDR) != 0);
 	to->m_pkthdr = from->m_pkthdr;
 	to->m_flags = from->m_flags & M_COPYFLAGS;
 	to->m_data = to->m_pktdat;
 	from->m_flags &= ~M_PKTHDR;
+}
 /*
  * Apply function f to the data in an mbuf chain starting "off" bytes from the
  * beginning, continuing for "len" bytes.
  */
 @@ -1895,27 +1897,27 @@ m_ext_free(struct mbuf *m)
 /*
  * Free a single mbuf and associated external storage. Return the
  * successor, if any.
  */
 struct mbuf *
 m_free(struct mbuf *m)
+{
 	struct mbuf *n;
 	mowner_revoke(m, 1, m->m_flags);
 	mbstat_type_add(m->m_type, -1);
 	if (m->m_flags & M_PKTHDR)
-		m_tag_delete_chain(m, NULL);
+		m_tag_delete_chain(m);
 	n = m->m_next;
 	if (m->m_flags & M_EXT) {
 		m_ext_free(m);
 	} else {
 		if (__predict_false(m->m_type == MT_FREE)) {
 			panic("mbuf %p already freed", m);
+		}
 		m->m_type = MT_FREE;
 		m->m_data = NULL;
 		pool_cache_put(mb_cache, m);
+	}
 @@ -2247,49 +2249,38 @@ void
 m_tag_unlink(struct mbuf *m, struct m_tag *t)
+{
 	SLIST_REMOVE(&m->m_pkthdr.tags, t, m_tag, m_tag_link);
+}
 void
 m_tag_delete(struct mbuf *m, struct m_tag *t)
+{
 	m_tag_unlink(m, t);
 	m_tag_free(t);
+}
 void
-m_tag_delete_chain(struct mbuf *m, struct m_tag *t)
+m_tag_delete_chain(struct mbuf *m)
+{
 	struct m_tag *p, *q;
-	if (t != NULL)
+	p = SLIST_FIRST(&m->m_pkthdr.tags);
 		p = t;
 	else
 		p = SLIST_FIRST(&m->m_pkthdr.tags);
 	if (p == NULL)
 		return;
 	while ((q = SLIST_NEXT(p, m_tag_link)) != NULL)
 		m_tag_delete(m, q);
 	m_tag_delete(m, p);
+}
 void
 m_tag_delete_nonpersistent(struct mbuf *m)
 	/* NetBSD has no persistent tags yet, so just delete all tags. */
 	m_tag_delete_chain(m, NULL);
 struct m_tag *
 m_tag_find(const struct mbuf *m, int type, struct m_tag *t)
+{
 	struct m_tag *p;
 	if (t == NULL)
 		p = SLIST_FIRST(&m->m_pkthdr.tags);
 	else
 		p = SLIST_NEXT(t, m_tag_link);
 	while (p != NULL) {
 		if (p->m_tag_id == type)
 			return p;
 		p = SLIST_NEXT(p, m_tag_link);
 @@ -2310,46 +2301,28 @@ m_tag_copy(struct m_tag *t)
+}
 /*
  * Copy two tag chains. The destination mbuf (to) loses any attached
  * tags even if the operation fails. This should not be a problem, as
  * m_tag_copy_chain() is typically called with a newly-allocated
  * destination mbuf.
  */
 int
 m_tag_copy_chain(struct mbuf *to, struct mbuf *from)
+{
 	struct m_tag *p, *t, *tprev = NULL;
-	m_tag_delete_chain(to, NULL);
+	m_tag_delete_chain(to);
 	SLIST_FOREACH(p, &from->m_pkthdr.tags, m_tag_link) {
 		t = m_tag_copy(p);
 		if (t == NULL) {
-			m_tag_delete_chain(to, NULL);
+			m_tag_delete_chain(to);
 			return 0;
+		}
 		if (tprev == NULL)
 			SLIST_INSERT_HEAD(&to->m_pkthdr.tags, t, m_tag_link);
 		else
 			SLIST_INSERT_AFTER(tprev, t, m_tag_link);
 		tprev = t;
+	}
 	return 1;
+}
 void
 m_tag_init(struct mbuf *m)
 	SLIST_INIT(&m->m_pkthdr.tags);
 struct m_tag *
 m_tag_first(struct mbuf *m)
 	return (SLIST_FIRST(&m->m_pkthdr.tags));
 struct m_tag *
 m_tag_next(struct mbuf *m, struct m_tag *t)
 	return (SLIST_NEXT(t, m_tag_link));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_loop.c,v 1.105 2018/08/10 06:46:09 maxv Exp $	*/
+/*	$NetBSD: if_loop.c,v 1.106 2018/11/15 10:06:07 maxv 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
  *    documentation and/or other materials provided with the distribution.
 @@ -55,27 +55,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
  */
 /*
  * Loopback interface driver for protocol testing and timing.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.105 2018/08/10 06:46:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.106 2018/11/15 10:06:07 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 @@ -288,27 +288,27 @@ looutput(struct ifnet *ifp, struct mbuf
 		M_PREPEND(m, sizeof(uint32_t), M_DONTWAIT);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
+		}
 		*(mtod(m, uint32_t *)) = dst->sa_family;
 		error = if_transmit_lock(ifp, m);
 		goto out;
+	}
 #endif /* ALTQ */
-	m_tag_delete_nonpersistent(m);
+	m_tag_delete_chain(m);
 #ifdef MPLS
 	if (rt != NULL && rt_gettag(rt) != NULL &&
 	    rt_gettag(rt)->sa_family == AF_MPLS &&
 	    (m->m_flags & (M_MCAST | M_BCAST)) == 0) {
 		union mpls_shim msh;
 		msh.s_addr = MPLS_GETSADDR(rt);
 		if (msh.shim.label != MPLS_LABEL_IMPLNULL) {
 			ifq = &mplsintrq;
 			isr = NETISR_MPLS;
+		}
+	}
 	if (isr != NETISR_MPLS)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: can.c,v 1.4 2018/06/26 06:48:03 msaitoh Exp $	*/
+/*	$NetBSD: can.c,v 1.5 2018/11/15 10:06:07 maxv Exp $	*/
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Robert Swindells and Manuel Bouyer
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.4 2018/06/26 06:48:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.5 2018/11/15 10:06:07 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/errno.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 @@ -261,27 +261,27 @@ can_output(struct mbuf *m, struct canpcb
 /*
  * cleanup mbuf tag, keeping the PACKET_TAG_SO tag
  */
 void
 can_mbuf_tag_clean(struct mbuf *m)
+{
 	struct m_tag *sotag;
 	sotag = m_tag_find(m, PACKET_TAG_SO, NULL);
 	if (sotag)
 		m_tag_unlink(m, sotag);
-	m_tag_delete_nonpersistent(m);
+	m_tag_delete_chain(m);
 	if (sotag)
 		m_tag_prepend(m, sotag);
+}
 /*
  * Process a received CAN frame
  * the packet is in the mbuf chain m with
  * the CAN header.
  */
 void
 can_input(struct ifnet *ifp, struct mbuf *m)
+{
 	struct ifqueue *inq;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_icmp.c,v 1.174 2018/09/14 05:09:51 maxv Exp $	*/
+/*	$NetBSD: ip_icmp.c,v 1.175 2018/11/15 10:06:07 maxv Exp $	*/
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of Zembu Labs, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -84,27 +84,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.174 2018/09/14 05:09:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.175 2018/11/15 10:06:07 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h> /* For softnet_lock */
 #include <sys/kmem.h>
 #include <sys/time.h>
 @@ -909,27 +909,27 @@ icmp_reflect(struct mbuf *m)
 		/*
 		 * Now strip out original options by copying rest of first
 		 * mbuf's data back, and adjust the IP length.
 		 */
 		ip->ip_len = htons(ntohs(ip->ip_len) - optlen);
 		ip->ip_hl = sizeof(struct ip) >> 2;
 		m->m_len -= optlen;
 		if (m->m_flags & M_PKTHDR)
 			m->m_pkthdr.len -= optlen;
 		optlen += sizeof(struct ip);
 		memmove(ip + 1, (char *)ip + optlen,
 		    (unsigned)(m->m_len - sizeof(struct ip)));
+	}
-	m_tag_delete_nonpersistent(m);
+	m_tag_delete_chain(m);
 	m->m_flags &= ~(M_BCAST|M_MCAST);
 	/*
 	 * Clear any in-bound checksum flags for this packet.
 	 */
 	if (m->m_flags & M_PKTHDR)
 		m->m_pkthdr.csum_flags = 0;
 	icmp_send(m, opts);
 done:
 	curlwp_bindx(bound);
 	if (opts)
 		(void)m_free(opts);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.211 2018/10/12 05:49:38 msaitoh Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.212 2018/11/15 10:06:07 maxv Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * 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
 @@ -808,34 +808,30 @@ struct mbuf *m_add(struct mbuf *, struct
 /* Inline routines. */
 static __inline u_int m_length(const struct mbuf *) __unused;
 /* Statistics */
 void mbstat_type_add(int, int);
 /* Packet tag routines */
 struct	m_tag *m_tag_get(int, int, int);
 void	m_tag_free(struct m_tag *);
 void	m_tag_prepend(struct mbuf *, struct m_tag *);
 void	m_tag_unlink(struct mbuf *, struct m_tag *);
 void	m_tag_delete(struct mbuf *, struct m_tag *);
-void	m_tag_delete_chain(struct mbuf *, struct m_tag *);
+void	m_tag_delete_chain(struct mbuf *);
 void	m_tag_delete_nonpersistent(struct mbuf *);
 struct	m_tag *m_tag_find(const struct mbuf *, int, struct m_tag *);
 struct	m_tag *m_tag_copy(struct m_tag *);
 int	m_tag_copy_chain(struct mbuf *, struct mbuf *);
 void	m_tag_init(struct mbuf *);
 struct	m_tag *m_tag_first(struct mbuf *);
 struct	m_tag *m_tag_next(struct mbuf *, struct m_tag *);
 /* Packet tag types */
 #define PACKET_TAG_NONE				0  /* Nothing */
 #define PACKET_TAG_SO				4  /* sending socket pointer */
 #define PACKET_TAG_PF				11 /* packet filter */
 #define PACKET_TAG_ALTQ_QID			12 /* ALTQ queue id */
 #define PACKET_TAG_IPSEC_OUT_DONE		18
 #define	PACKET_TAG_IPSEC_NAT_T_PORTS		25 /* two uint16_t */
 #define	PACKET_TAG_INET6			26 /* IPv6 info */
 #define	PACKET_TAG_TUNNEL_INFO			28 /* tunnel identification and
 						    * protocol callback, for
 						    * loop detection/recovery
 						    */

 @@ -1,14 +1,14 @@
-#       $NetBSD: Makefile,v 1.431 2018/10/05 09:51:55 hannken Exp $
+#       $NetBSD: Makefile,v 1.432 2018/11/15 10:06:06 maxv Exp $
 #	Makefile for section 9 (kernel function and variable) manual pages.
 MAN=	accept_filter.9 accf_data.9 accf_http.9 \
 	altq.9 arp.9 audio.9 audio_system.9 autoconf.9 \
 	bcdtobin.9 bcmp.9 bcopy.9 bintime_add.9 bluetooth.9 boothowto.9 bpf.9 \
 	buffercache.9 bufferio.9 bufq.9 bus_dma.9 bus_space.9 byteorder.9 \
 	bzero.9 \
 	callback.9 callout.9 cardbus.9 clock.9 cnmagic.9 condvar.9 config.9 \
 	cons.9 copy.9 coredump_write.9 \
 	cpu_configure.9 cpu_coredump.9 cpu_dumpconf.9 \
 	cpu_lwp_fork.9 \
 	cpu_idle.9 cpu_initclocks.9 cpu_need_resched.9 \
 @@ -536,33 +536,29 @@ MLINKS+=module.9 module_autoload.9 \
 	module.9 module_start_unload_thread.9 \
 	module.9 module_unload.9 \
 	module.9 module_register_callbacks.9 \
 	module.9 module_unregister_callbacks.9
 MLINKS+=mstohz.9 hztoms.9
 MLINKS+=mutex.9 mutex_init.9 mutex.9 mutex_destroy.9 mutex.9 mutex_enter.9 \
 	mutex.9 mutex_exit.9 mutex.9 mutex_tryenter.9 mutex.9 mutex_owned.9 \
 	mutex.9 mutex_ownable.9 \
 	mutex.9 mutex_spin_enter.9 mutex.9 mutex_spin_exit.9
 MLINKS+=m_tag.9 m_tag_copy.9 \
 	m_tag.9 m_tag_copy_chain.9 \
 	m_tag.9 m_tag_delete.9 \
 	m_tag.9 m_tag_delete_chain.9 \
 	m_tag.9 m_tag_delete_nonpersistent.9 \
 	m_tag.9 m_tag_find.9 \
 	m_tag.9 m_tag_first.9 \
 	m_tag.9 m_tag_free.9 \
 	m_tag.9 m_tag_get.9 \
 	m_tag.9 m_tag_init.9 \
 	m_tag.9 m_tag_next.9 \
 	m_tag.9 m_tag_prepend.9 \
 	m_tag.9 m_tag_unlink.9
 MLINKS+=namecache.9 cache_lookup.9 \
 	namecache.9 cache_revlookup.9 \
 	namecache.9 cache_enter.9 \
 	namecache.9 cache_purge.9 \
 	namecache.9 cache_purgevfs.9 \
 	namecache.9 namecache_print.9
 MLINKS+=namei.9 lookup.9 \
 	namei.9 relookup.9 \
 	namei.9 NDINIT.9
 MLINKS+=nullop.9 voidop.9 \
 	nullop.9 enodev.9 \

 @@ -1,14 +1,14 @@
-.\"     $NetBSD: m_tag.9,v 1.6 2018/11/15 09:38:57 maxv Exp $
+.\"     $NetBSD: m_tag.9,v 1.7 2018/11/15 10:06:06 maxv Exp $
 .\"
 .\" Copyright (c)2004 YAMAMOTO Takashi,
 .\" 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
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 @@ -26,63 +26,51 @@
 .\"
 .\" ------------------------------------------------------------
 .Dd November 15, 2018
 .Dt M_TAG 9
 .Os
 .Sh NAME
 .Nm m_tag ,
 .Nm m_tag_get ,
 .Nm m_tag_free ,
 .Nm m_tag_prepend ,
 .Nm m_tag_unlink ,
 .Nm m_tag_delete ,
 .Nm m_tag_delete_chain ,
 .Nm m_tag_delete_nonpersistent ,
 .Nm m_tag_find ,
 .Nm m_tag_copy ,
-.Nm m_tag_copy_chain ,
+.Nm m_tag_copy_chain
 .Nm m_tag_init ,
 .Nm m_tag_first ,
 .Nm m_tag_next
 .Nd mbuf tagging interfaces
 .\" ------------------------------------------------------------
 .Sh SYNOPSIS
 .In sys/mbuf.h
 .Ft struct m_tag *
 .Fn m_tag_get "int type" "int len" "int wait"
 .Ft void
 .Fn m_tag_free "struct m_tag *t"
 .Ft void
 .Fn m_tag_prepend "struct mbuf *m" "struct m_tag *t"
 .Ft void
 .Fn m_tag_unlink "struct mbuf *m" "struct m_tag *t"
 .Ft void
 .Fn m_tag_delete "struct mbuf *m" "struct m_tag *t"
 .Ft void
-.Fn m_tag_delete_chain "struct mbuf *m" "struct m_tag *t"
+.Fn m_tag_delete_chain "struct mbuf *m"
 .Ft void
 .Fn m_tag_delete_nonpersistent "struct mbuf *"
 .Ft struct m_tag *
 .Fn m_tag_find "struct mbuf *m" "int type" "struct m_tag *t"
 .Ft struct m_tag *
 .Fn m_tag_copy "struct m_tag *m"
 .Ft int
 .Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from"
 .Ft void
 .Fn m_tag_init "struct mbuf *m"
 .Ft struct m_tag *
 .Fn m_tag_first "struct mbuf *m"
 .Ft struct m_tag *
 .Fn m_tag_next "struct mbuf *m" "struct m_tag *t"
 .\" ------------------------------------------------------------
 .Sh DESCRIPTION
 The
 .Nm
 interface is used to
 .Dq tag
 mbufs.
 .\" XXX PACKET_TAG_*
 .\" ------------------------------------------------------------
 .Sh FUNCTIONS
 .Bl -tag -width compact
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_get "type" "len" "wait"
 @@ -119,41 +107,28 @@ will also be freed.
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_unlink "m" "t"
 Unlink the mbuf tag
 .Fa t
 from the mbuf
 .Fa m .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_delete "m" "t"
 The same as
 .Fn m_tag_unlink
 followed by
 .Fn m_tag_free .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-.It Fn m_tag_delete_chain "m" "t"
+.It Fn m_tag_delete_chain "m"
-Unlink and free mbuf tags beginning with the mbuf tag
+Unlink and free mbuf tags from the mbuf
 .Fa t
 from the mbuf
 .Fa m .
 If
 .Fa t
 is
 .Dv NULL ,
 .Fn m_tag_delete_chain
 unlinks and frees all mbuf tags associated with the mbuf
 .Fa m .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_delete_nonpersistent "m"
 Unlink and free all non persistent tags associated with the mbuf
 .Fa m .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_find "m" "type" "t"
 Find an mbuf tag with type
 .Fa type
 after the mbuf tag
 .Fa t
 in the tag chain associated with the mbuf
 .Fa m .
 If
 .Fa t
 is
 .Dv NULL ,
 @@ -170,48 +145,26 @@ Otherwise return
 .Dv NULL .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_copy_chain "to" "from"
 Copy all mbuf tags associated with the mbuf
 .Fa from
 to the mbuf
 .Fa to .
 If
 .Fa to
 already has any mbuf tags, they will be unlinked and freed beforehand.
 Return 1 on success.
 Otherwise return 0.
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_init "m"
 Initialize mbuf tag chain of the mbuf
 .Fa m .
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_first "m"
 Return the first mbuf tag associated with the mbuf
 .Fa m .
 Return
 .Dv NULL
 if no mbuf tags are found.
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .It Fn m_tag_next "m" "t"
 Return the next mbuf tag after
 .Fa t
 associated with the mbuf
 .Fa m .
 Return
 .Dv NULL
 if
 .Fa t
 is the last tag in the chain.
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .El
 .\" ------------------------------------------------------------
 .Sh CODE REFERENCES
 The mbuf tagging interfaces are implemented within the file
 .Pa sys/kern/uipc_mbuf.c .
 .Pp
 The
 .Dv PACKET_TAG_
 macros are defined in the file
 .Pa sys/sys/mbuf.h .
 .Sh SEE ALSO
 .Xr intro 9 ,
 .Xr malloc 9 ,