diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 97bbe68efcfc..7cbc89a1966b 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwi.c,v 1.34 2018/06/26 06:48:00 msaitoh Exp $	*/
+/*	$NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $	*/
 /*	$OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.34 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -8529,6 +8529,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_idx)
 			mb.m_len = sc->sc_rxtap_len;
 			mb.m_next = m;
 			mb.m_nextpkt = NULL;
+			mb.m_owner = NULL;
 			mb.m_type = 0;
 			mb.m_flags = 0;
 			bpf_mtap3(sc->sc_drvbpf, &mb, BPF_D_IN);
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 17ab3712ca1b..d6071c0256d6 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.49 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.49 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -569,6 +569,7 @@ txp_download_fw_section(struct txp_softc *sc,
 	 */
 	m.m_type = MT_DATA;
 	m.m_next = m.m_nextpkt = NULL;
+	m.m_owner = NULL;
 	m.m_len = le32toh(sect->nbytes);
 	m.m_data = dma.dma_vaddr;
 	m.m_flags = 0;
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 6ebe7e535487..0de9231ef918 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.30 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.30 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
@@ -523,9 +523,13 @@ lptap(struct ifnet *ifp, struct mbuf *m, u_int direction)
 	u_int32_t af = AF_INET;
 	struct mbuf m0;
 
+	m0.m_type = MT_DATA;
 	m0.m_next = m;
+	m0.m_nextpkt = NULL;
+	m0.m_owner = NULL;
 	m0.m_len = sizeof(u_int32_t);
 	m0.m_data = (char *)&af;
+	m0.m_flags = 0;
 	bpf_mtap(ifp, &m0, direction);
 }
 
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index defa656da2c9..e3e46a90a5bc 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpf.c,v 1.226 2018/06/26 06:48:02 msaitoh Exp $	*/
+/*	$NetBSD: bpf.c,v 1.227 2018/07/25 07:55:45 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.226 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.227 2018/07/25 07:55:45 msaitoh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
@@ -1650,6 +1650,7 @@ _bpf_mtap2(struct bpf_if *bp, void *data, u_int dlen, struct mbuf *m,
 	 * absolutely needed--this mbuf should never go anywhere else.
 	 */
 	(void)memset(&mb, 0, sizeof(mb));
+	mb.m_type = MT_DATA;
 	mb.m_next = m;
 	mb.m_data = data;
 	mb.m_len = dlen;
@@ -1700,8 +1701,11 @@ _bpf_mtap_af(struct bpf_if *bp, uint32_t af, struct mbuf *m, u_int direction)
 {
 	struct mbuf m0;
 
+	m0.m_type = MT_DATA;
 	m0.m_flags = 0;
 	m0.m_next = m;
+	m0.m_nextpkt = NULL;
+	m0.m_owner = NULL;
 	m0.m_len = 4;
 	m0.m_data = (char *)&af;
 
@@ -1743,8 +1747,11 @@ _bpf_mtap_sl_out(struct bpf_if *bp, u_char *chdr, struct mbuf *m)
 	struct mbuf m0;
 	u_char *hp;
 
+	m0.m_type = MT_DATA;
 	m0.m_flags = 0;
 	m0.m_next = m;
+	m0.m_nextpkt = NULL;
+	m0.m_owner = NULL;
 	m0.m_data = m0.m_dat;
 	m0.m_len = SLIP_HDRLEN;
 
diff --git a/sys/netisdn/i4b_ipr.c b/sys/netisdn/i4b_ipr.c
index fc09bb4c8f97..9add6f314b56 100644
--- a/sys/netisdn/i4b_ipr.c
+++ b/sys/netisdn/i4b_ipr.c
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
  *
- *	$Id: i4b_ipr.c,v 1.45 2018/06/26 06:48:03 msaitoh Exp $
+ *	$Id: i4b_ipr.c,v 1.46 2018/07/25 07:55:45 msaitoh Exp $
  *
  * $FreeBSD$
  *
@@ -59,7 +59,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.45 2018/06/26 06:48:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.46 2018/07/25 07:55:45 msaitoh Exp $");
 
 #include "irip.h"
 #include "opt_irip.h"
@@ -1066,7 +1066,12 @@ error:
 		/* prepend the address family as a four byte field */
 		struct mbuf mm;
 		u_int af = AF_INET;
+
+		mm.m_type = MT_DATA;
+		mm.m_flags = 0;
 		mm.m_next = m;
+		mm.m_nextpkt = NULL;
+		mm.m_owner = NULL;
 		mm.m_len = 4;
 		mm.m_data = (char *)&af;