Module Name: src
Committed By: snj
Date: Thu Jul 26 23:55:31 UTC 2018
Modified Files:
src/sys/arch/acorn32/podulebus [netbsd-8]: if_ie.c
src/sys/arch/amiga/dev [netbsd-8]: if_es.c if_qn.c
src/sys/arch/arm/at91 [netbsd-8]: at91emac.c
src/sys/arch/arm/ep93xx [netbsd-8]: epe.c
src/sys/arch/emips/ebus [netbsd-8]: if_le_ebus.c
src/sys/arch/mac68k/dev [netbsd-8]: if_mc.c
src/sys/arch/macppc/dev [netbsd-8]: am79c950.c
src/sys/arch/newsmips/apbus [netbsd-8]: if_sn.c
src/sys/arch/next68k/dev [netbsd-8]: mb8795.c
src/sys/arch/playstation2/dev [netbsd-8]: if_smap.c
src/sys/arch/sun2/dev [netbsd-8]: if_ec.c
src/sys/arch/sun3/dev [netbsd-8]: if_ie.c
src/sys/arch/x68k/dev [netbsd-8]: if_ne_intio.c
src/sys/arch/xen/xen [netbsd-8]: if_xennet_xenbus.c xennetback_xenbus.c
src/sys/dev/bi [netbsd-8]: if_ni.c
src/sys/dev/cadence [netbsd-8]: if_cemac.c
src/sys/dev/ic [netbsd-8]: am7990.c am79900.c an.c cs89x0.c dm9000.c
dp8390.c elink3.c elinkxl.c hme.c i82586.c lance.c mb86950.c
mb86960.c mtd803.c pdq_ifsubr.c rrunner.c seeq8005.c sgec.c
smc90cx6.c smc91cxx.c tropic.c wi.c
src/sys/dev/isa [netbsd-8]: if_eg.c if_el.c if_iy.c
src/sys/dev/ofw [netbsd-8]: ofnet.c
src/sys/dev/pci [netbsd-8]: if_alc.c if_de.c if_fpa.c if_jme.c if_tl.c
if_vte.c
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.h
src/sys/dev/pcmcia [netbsd-8]: if_cnw.c if_malo_pcmcia.c if_ray.c
if_xi.c mhzc.c xirc.c
src/sys/dev/qbus [netbsd-8]: if_de.c if_qe.c if_qt.c
src/sys/dev/sbus [netbsd-8]: be.c qe.c
src/sys/dev/scsipi [netbsd-8]: if_se.c
src/sys/dev/usb [netbsd-8]: if_atu.c
src/sys/net [netbsd-8]: if_l2tp.c if_ppp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #938):
sys/arch/acorn32/podulebus/if_ie.c: revision 1.41
sys/arch/amiga/dev/if_es.c: revision 1.58
sys/arch/amiga/dev/if_qn.c: revision 1.45
sys/arch/arm/at91/at91emac.c: revision 1.20
sys/arch/arm/ep93xx/epe.c: revision 1.37
sys/arch/emips/ebus/if_le_ebus.c: revision 1.14
sys/arch/emips/ebus/if_le_ebus.c: revision 1.15
sys/arch/mac68k/dev/if_mc.c: revision 1.46
sys/arch/macppc/dev/am79c950.c: revision 1.39
sys/arch/newsmips/apbus/if_sn.c: revision 1.40
sys/arch/next68k/dev/mb8795.c: revision 1.59
sys/arch/playstation2/dev/if_smap.c: revision 1.25
sys/arch/playstation2/dev/if_smap.c: revision 1.26
sys/arch/sun2/dev/if_ec.c: revision 1.28
sys/arch/sun3/dev/if_ie.c: revision 1.63
sys/arch/x68k/dev/if_ne_intio.c: revision 1.19
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.75
sys/arch/xen/xen/xennetback_xenbus.c: revision 1.63
sys/dev/bi/if_ni.c: revision 1.45
sys/dev/cadence/if_cemac.c: revision 1.12
sys/dev/ic/am7990.c: revision 1.78
sys/dev/ic/am79900.c: revision 1.27
sys/dev/ic/an.c: revision 1.67
sys/dev/ic/cs89x0.c: revision 1.40
sys/dev/ic/dm9000.c: revision 1.13
sys/dev/ic/dm9000.c: revision 1.14
sys/dev/ic/dp8390.c: revision 1.88
sys/dev/ic/elink3.c: revision 1.141
sys/dev/ic/elinkxl.c: revision 1.122
sys/dev/ic/hme.c: revision 1.98
sys/dev/ic/i82586.c: revision 1.77
sys/dev/ic/lance.c: revision 1.53
sys/dev/ic/mb86950.c: revision 1.27
sys/dev/ic/mb86960.c: revision 1.86
sys/dev/ic/mtd803.c: revision 1.34
sys/dev/ic/pdq_ifsubr.c: revision 1.59
sys/dev/ic/rrunner.c: revision 1.86
sys/dev/ic/seeq8005.c: revision 1.58
sys/dev/ic/sgec.c: revision 1.47
sys/dev/ic/smc90cx6.c: revision 1.72
sys/dev/ic/smc91cxx.c: revision 1.96
sys/dev/ic/tropic.c: revision 1.49
sys/dev/ic/wi.c: revision 1.245
sys/dev/isa/if_eg.c: revision 1.93
sys/dev/isa/if_el.c: revision 1.95
sys/dev/isa/if_iy.c: revision 1.101
sys/dev/ofw/ofnet.c: revision 1.58
sys/dev/pci/if_alc.c: revision 1.27
sys/dev/pci/if_de.c: revision 1.152
sys/dev/pci/if_fpa.c: revision 1.61
sys/dev/pci/if_jme.c: revision 1.34
sys/dev/pci/if_tl.c: revision 1.108
sys/dev/pci/if_vte.c: revision 1.19
sys/dev/pci/ixgbe/ixgbe.h: revision 1.50
sys/dev/pcmcia/if_cnw.c: revision 1.62
sys/dev/pcmcia/if_malo_pcmcia.c: revision 1.17
sys/dev/pcmcia/if_ray.c: revision 1.89
sys/dev/pcmcia/if_xi.c: revision 1.81
sys/dev/pcmcia/mhzc.c: revision 1.51
sys/dev/pcmcia/xirc.c: revision 1.34
sys/dev/qbus/if_de.c: revision 1.33
sys/dev/qbus/if_qe.c: revision 1.78
sys/dev/qbus/if_qt.c: revision 1.22
sys/dev/sbus/be.c: revision 1.87
sys/dev/sbus/qe.c: revision 1.68
sys/dev/scsipi/if_se.c: revision 1.96
sys/dev/usb/if_atu.c: revision 1.59
sys/net/if_l2tp.c: revision 1.28 via patch
sys/net/if_ppp.c: revision 1.160
It's not required to include net/bpfdesc.h. Remove it.
--
Simplify like other drivers. NULL check of ifp->if_bpf is done in
bpf_mtap(), so it's not required to do it here.
--
Remove duplicated inclusion of net/bpf.h.
--
Remove duplicated inclusion of net/bpf.h.
--
Simplify bpf_mtap() call. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.57 -r1.57.6.1 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.44 -r1.44.6.1 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.36 -r1.36.6.1 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.38 -r1.38.6.1 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/arch/newsmips/apbus/if_sn.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/playstation2/dev/if_smap.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/sun2/dev/if_ec.c
cvs rdiff -u -r1.62 -r1.62.6.1 src/sys/arch/sun3/dev/if_ie.c
cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/arch/x68k/dev/if_ne_intio.c
cvs rdiff -u -r1.70 -r1.70.6.1 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.58.8.1 -r1.58.8.2 src/sys/arch/xen/xen/xennetback_xenbus.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/bi/if_ni.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/dev/ic/am7990.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/dev/ic/am79900.c
cvs rdiff -u -r1.65.2.1 -r1.65.2.2 src/sys/dev/ic/an.c
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/dev/ic/cs89x0.c
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/dev/ic/dm9000.c
cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/dev/ic/dp8390.c
cvs rdiff -u -r1.140 -r1.140.8.1 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.121 -r1.121.6.1 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/ic/i82586.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/ic/lance.c
cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/dev/ic/mb86950.c
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/dev/ic/mb86960.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/ic/mtd803.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/ic/pdq_ifsubr.c
cvs rdiff -u -r1.83 -r1.83.8.1 src/sys/dev/ic/rrunner.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/ic/seeq8005.c
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/dev/ic/sgec.c
cvs rdiff -u -r1.70.2.1 -r1.70.2.2 src/sys/dev/ic/smc90cx6.c
cvs rdiff -u -r1.95 -r1.95.2.1 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/ic/tropic.c
cvs rdiff -u -r1.243.6.1 -r1.243.6.2 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/isa/if_eg.c
cvs rdiff -u -r1.94 -r1.94.8.1 src/sys/dev/isa/if_el.c
cvs rdiff -u -r1.100 -r1.100.6.1 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/ofw/ofnet.c
cvs rdiff -u -r1.24.8.1 -r1.24.8.2 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.150 -r1.150.8.1 src/sys/dev/pci/if_de.c
cvs rdiff -u -r1.60 -r1.60.10.1 src/sys/dev/pci/if_fpa.c
cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.107 -r1.107.2.1 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.24.6.12 -r1.24.6.13 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.13.6.2 -r1.13.6.3 src/sys/dev/pcmcia/if_malo_pcmcia.c
cvs rdiff -u -r1.86 -r1.86.8.1 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/dev/pcmcia/if_xi.c
cvs rdiff -u -r1.50 -r1.50.30.1 src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.33 -r1.33.40.1 src/sys/dev/pcmcia/xirc.c
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/dev/qbus/if_de.c
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/dev/qbus/if_qe.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/qbus/if_qt.c
cvs rdiff -u -r1.85.8.1 -r1.85.8.2 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.94.8.1 -r1.94.8.2 src/sys/dev/scsipi/if_se.c
cvs rdiff -u -r1.55.8.1 -r1.55.8.2 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.11.2.8 -r1.11.2.9 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.158 -r1.158.8.1 src/sys/net/if_ppp.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/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.39 src/sys/arch/acorn32/podulebus/if_ie.c:1.39.6.1
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.39 Wed Feb 22 09:45:15 2017
+++ src/sys/arch/acorn32/podulebus/if_ie.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.39 2017/02/22 09:45:15 nonaka Exp $ */
+/* $NetBSD: if_ie.c,v 1.39.6.1 2018/07/26 23:55:28 snj Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.39 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.39.6.1 2018/07/26 23:55:28 snj Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -101,7 +101,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
/* BPF support */
#include <net/bpf.h>
-#include <net/bpfdesc.h>
/* Some useful defines and macros */
Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.57 src/sys/arch/amiga/dev/if_es.c:1.57.6.1
--- src/sys/arch/amiga/dev/if_es.c:1.57 Wed Feb 22 09:45:15 2017
+++ src/sys/arch/amiga/dev/if_es.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.57 2017/02/22 09:45:15 nonaka Exp $ */
+/* $NetBSD: if_es.c,v 1.57.6.1 2018/07/26 23:55:28 snj Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.57 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.57.6.1 2018/07/26 23:55:28 snj Exp $");
#include <sys/param.h>
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -92,9 +93,6 @@ struct es_softc {
#endif
};
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef ESDEBUG
/* console error messages */
int esdebug = 0;
Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.44 src/sys/arch/amiga/dev/if_qn.c:1.44.6.1
--- src/sys/arch/amiga/dev/if_qn.c:1.44 Wed Feb 22 09:45:15 2017
+++ src/sys/arch/amiga/dev/if_qn.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.44 2017/02/22 09:45:15 nonaka Exp $ */
+/* $NetBSD: if_qn.c,v 1.44.6.1 2018/07/26 23:55:28 snj Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.44 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.44.6.1 2018/07/26 23:55:28 snj Exp $");
#include "qn.h"
#if NQN > 0
@@ -98,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -143,9 +144,6 @@ struct qn_softc {
u_char transmit_pending;
} qn_softc[NQN];
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
int qnmatch(device_t, cfdata_t, void *);
void qnattach(device_t, device_t, void *);
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.19 src/sys/arch/arm/at91/at91emac.c:1.19.6.1
--- src/sys/arch/arm/at91/at91emac.c:1.19 Mon Feb 20 08:25:57 2017
+++ src/sys/arch/arm/at91/at91emac.c Thu Jul 26 23:55:28 2018
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $ */
-/* $NetBSD: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $ */
+/* $Id: at91emac.c,v 1.19.6.1 2018/07/26 23:55:28 snj Exp $ */
+/* $NetBSD: at91emac.c,v 1.19.6.1 2018/07/26 23:55:28 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.19.6.1 2018/07/26 23:55:28 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -68,9 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef IPKDB_AT91 // @@@
#include <ipkdb/ipkdb.h>
#endif
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.36 src/sys/arch/arm/ep93xx/epe.c:1.36.6.1
--- src/sys/arch/arm/ep93xx/epe.c:1.36 Wed Feb 22 09:45:15 2017
+++ src/sys/arch/arm/ep93xx/epe.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.36 2017/02/22 09:45:15 nonaka Exp $ */
+/* $NetBSD: epe.c,v 1.36.6.1 2018/07/26 23:55:28 snj Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36.6.1 2018/07/26 23:55:28 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -65,9 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/epereg.h>
#include <arm/ep93xx/epevar.h>
Index: src/sys/arch/emips/ebus/if_le_ebus.c
diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.13 src/sys/arch/emips/ebus/if_le_ebus.c:1.13.8.1
--- src/sys/arch/emips/ebus/if_le_ebus.c:1.13 Thu Dec 15 09:28:02 2016
+++ src/sys/arch/emips/ebus/if_le_ebus.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ebus.c,v 1.13 2016/12/15 09:28:02 ozaki-r Exp $ */
+/* $NetBSD: if_le_ebus.c,v 1.13.8.1 2018/07/26 23:55:28 snj Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.13 2016/12/15 09:28:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.13.8.1 2018/07/26 23:55:28 snj Exp $");
#include "opt_inet.h"
@@ -51,15 +51,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/rndsource.h>
#include <emips/ebus/ebusvar.h>
@@ -875,8 +873,7 @@ enic_start(struct ifnet *ifp)
* If BPF is listening on this interface, let it see the packet
* before we commit it to the wire.
*/
- if (ifp->if_bpf)
- bpf_mtap(ifp, m);
+ bpf_mtap(ifp, m);
/*
* Copy the mbuf chain into a contiguous transmit buffer.
Index: src/sys/arch/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.45 src/sys/arch/mac68k/dev/if_mc.c:1.45.6.1
--- src/sys/arch/mac68k/dev/if_mc.c:1.45 Wed Feb 22 09:45:16 2017
+++ src/sys/arch/mac68k/dev/if_mc.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.45 2017/02/22 09:45:16 nonaka Exp $ */
+/* $NetBSD: if_mc.c,v 1.45.6.1 2018/07/26 23:55:28 snj Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.45 2017/02/22 09:45:16 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.45.6.1 2018/07/26 23:55:28 snj Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -65,11 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.
#include <netinet/ip.h>
#endif
-
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <machine/bus.h>
#include <mac68k/dev/if_mcreg.h>
#include <mac68k/dev/if_mcvar.h>
Index: src/sys/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.38 src/sys/arch/macppc/dev/am79c950.c:1.38.6.1
--- src/sys/arch/macppc/dev/am79c950.c:1.38 Wed Feb 22 09:45:16 2017
+++ src/sys/arch/macppc/dev/am79c950.c Thu Jul 26 23:55:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.38 2017/02/22 09:45:16 nonaka Exp $ */
+/* $NetBSD: am79c950.c,v 1.38.6.1 2018/07/26 23:55:28 snj Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@bga.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.38 2017/02/22 09:45:16 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.38.6.1 2018/07/26 23:55:28 snj Exp $");
#include "opt_inet.h"
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -63,9 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v
#include <netinet/ip.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <macppc/dev/am79c950reg.h>
Index: src/sys/arch/newsmips/apbus/if_sn.c
diff -u src/sys/arch/newsmips/apbus/if_sn.c:1.38.6.1 src/sys/arch/newsmips/apbus/if_sn.c:1.38.6.2
--- src/sys/arch/newsmips/apbus/if_sn.c:1.38.6.1 Sat Aug 5 04:17:03 2017
+++ src/sys/arch/newsmips/apbus/if_sn.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sn.c,v 1.38.6.1 2017/08/05 04:17:03 snj Exp $ */
+/* $NetBSD: if_sn.c,v 1.38.6.2 2018/07/26 23:55:29 snj Exp $ */
/*
* National Semiconductor DP8393X SONIC Driver
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.38.6.1 2017/08/05 04:17:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.38.6.2 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -34,6 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -45,9 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.
#include <uvm/uvm_extern.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <machine/cpu.h>
#include <newsmips/apbus/apbusvar.h>
#include <newsmips/apbus/if_snreg.h>
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.58 src/sys/arch/next68k/dev/mb8795.c:1.58.6.1
--- src/sys/arch/next68k/dev/mb8795.c:1.58 Fri Mar 31 08:38:13 2017
+++ src/sys/arch/next68k/dev/mb8795.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.58 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: mb8795.c,v 1.58.6.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.58 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.58.6.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
-
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -54,11 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1
#include <netinet/ip.h>
#endif
-
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <machine/cpu.h>
#include <machine/bus.h>
#include <machine/intr.h>
Index: src/sys/arch/playstation2/dev/if_smap.c
diff -u src/sys/arch/playstation2/dev/if_smap.c:1.23 src/sys/arch/playstation2/dev/if_smap.c:1.23.8.1
--- src/sys/arch/playstation2/dev/if_smap.c:1.23 Thu Dec 15 09:28:04 2016
+++ src/sys/arch/playstation2/dev/if_smap.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smap.c,v 1.23 2016/12/15 09:28:04 ozaki-r Exp $ */
+/* $NetBSD: if_smap.c,v 1.23.8.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.23 2016/12/15 09:28:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.23.8.1 2018/07/26 23:55:29 snj Exp $");
#include "debug_playstation2.h"
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
-
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#include <dev/mii/miivar.h>
@@ -60,9 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v
#include <netinet/ip.h>
#include <netinet/if_inarp.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <playstation2/dev/spdvar.h>
#include <playstation2/dev/spdreg.h>
#include <playstation2/dev/emac3var.h>
@@ -500,8 +497,7 @@ smap_start(struct ifnet *ifp)
IFQ_DEQUEUE(&ifp->if_snd, m0);
KDASSERT(m0 != NULL);
- if (ifp->if_bpf)
- bpf_mtap(ifp, m0);
+ bpf_mtap(ifp, m0);
p = (u_int8_t *)sc->tx_buf;
q = p + sz;
Index: src/sys/arch/sun2/dev/if_ec.c
diff -u src/sys/arch/sun2/dev/if_ec.c:1.27 src/sys/arch/sun2/dev/if_ec.c:1.27.8.1
--- src/sys/arch/sun2/dev/if_ec.c:1.27 Thu Dec 15 09:28:04 2016
+++ src/sys/arch/sun2/dev/if_ec.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.27 2016/12/15 09:28:04 ozaki-r Exp $ */
+/* $NetBSD: if_ec.c,v 1.27.8.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.27 2016/12/15 09:28:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.27.8.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
-
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -65,9 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <machine/cpu.h>
#include <machine/autoconf.h>
#include <machine/idprom.h>
Index: src/sys/arch/sun3/dev/if_ie.c
diff -u src/sys/arch/sun3/dev/if_ie.c:1.62 src/sys/arch/sun3/dev/if_ie.c:1.62.6.1
--- src/sys/arch/sun3/dev/if_ie.c:1.62 Wed Feb 22 09:45:16 2017
+++ src/sys/arch/sun3/dev/if_ie.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.62 2017/02/22 09:45:16 nonaka Exp $ */
+/* $NetBSD: if_ie.c,v 1.62.6.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.62 2017/02/22 09:45:16 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.62.6.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -118,9 +118,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#ifdef INET
#include <netinet/in.h>
Index: src/sys/arch/x68k/dev/if_ne_intio.c
diff -u src/sys/arch/x68k/dev/if_ne_intio.c:1.18 src/sys/arch/x68k/dev/if_ne_intio.c:1.18.10.1
--- src/sys/arch/x68k/dev/if_ne_intio.c:1.18 Wed May 20 09:17:18 2015
+++ src/sys/arch/x68k/dev/if_ne_intio.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $ */
+/* $NetBSD: if_ne_intio.c,v 1.18.10.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.18.10.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_intio.
#if BPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <machine/bus.h>
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.1
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70 Sat Mar 4 19:11:01 2017
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.70 2017/03/04 19:11:01 bouyer Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.70.6.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70 2017/03/04 19:11:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70.6.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xe
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#if defined(NFS_BOOT_BOOTSTATIC)
#include <sys/fstypes.h>
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.58.8.1 src/sys/arch/xen/xen/xennetback_xenbus.c:1.58.8.2
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.58.8.1 Sun Jul 15 10:54:03 2018
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.58.8.1 2018/07/15 10:54:03 martin Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.58.8.2 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.58.8.1 2018/07/15 10:54:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.58.8.2 2018/07/26 23:55:29 snj Exp $");
#include "opt_xen.h"
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: xennetback_x
#include <net/route.h>
#include <net/netisr.h>
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <net/if_ether.h>
Index: src/sys/dev/bi/if_ni.c
diff -u src/sys/dev/bi/if_ni.c:1.44 src/sys/dev/bi/if_ni.c:1.44.8.1
--- src/sys/dev/bi/if_ni.c:1.44 Thu Dec 15 09:28:04 2016
+++ src/sys/dev/bi/if_ni.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ni.c,v 1.44 2016/12/15 09:28:04 ozaki-r Exp $ */
+/* $NetBSD: if_ni.c,v 1.44.8.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.44 2016/12/15 09:28:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.44.8.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -51,13 +51,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#include <netinet/in.h>
#include <netinet/if_inarp.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#ifdef __vax__
#include <machine/mtpr.h>
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.11 src/sys/dev/cadence/if_cemac.c:1.11.2.1
--- src/sys/dev/cadence/if_cemac.c:1.11 Tue May 23 02:19:14 2017
+++ src/sys/dev/cadence/if_cemac.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: if_cemac.c,v 1.11.2.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.11.2.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -63,6 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -75,9 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef IPKDB_AT91 // @@@
#include <ipkdb/ipkdb.h>
#endif
Index: src/sys/dev/ic/am7990.c
diff -u src/sys/dev/ic/am7990.c:1.77 src/sys/dev/ic/am7990.c:1.77.2.1
--- src/sys/dev/ic/am7990.c:1.77 Tue May 23 04:51:31 2017
+++ src/sys/dev/ic/am7990.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.77 2017/05/23 04:51:31 ozaki-r Exp $ */
+/* $NetBSD: am7990.c,v 1.77.2.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.77 2017/05/23 04:51:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.77.2.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,9 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
Index: src/sys/dev/ic/am79900.c
diff -u src/sys/dev/ic/am79900.c:1.26 src/sys/dev/ic/am79900.c:1.26.2.1
--- src/sys/dev/ic/am79900.c:1.26 Tue May 23 04:51:31 2017
+++ src/sys/dev/ic/am79900.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900.c,v 1.26 2017/05/23 04:51:31 ozaki-r Exp $ */
+/* $NetBSD: am79900.c,v 1.26.2.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.26 2017/05/23 04:51:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.26.2.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,9 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: am79900.c,v
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
Index: src/sys/dev/ic/an.c
diff -u src/sys/dev/ic/an.c:1.65.2.1 src/sys/dev/ic/an.c:1.65.2.2
--- src/sys/dev/ic/an.c:1.65.2.1 Sun Dec 10 10:10:23 2017
+++ src/sys/dev/ic/an.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.65.2.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: an.c,v 1.65.2.2 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ctr.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.65.2.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.65.2.2 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
@@ -104,14 +104,12 @@ __KERNEL_RCSID(0, "$NetBSD: an.c,v 1.65.
#include <net/if_llc.h>
#include <net/if_media.h>
#include <net/if_types.h>
+#include <net/bpf.h>
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_radiotap.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <dev/ic/anreg.h>
#include <dev/ic/anvar.h>
Index: src/sys/dev/ic/cs89x0.c
diff -u src/sys/dev/ic/cs89x0.c:1.39 src/sys/dev/ic/cs89x0.c:1.39.6.1
--- src/sys/dev/ic/cs89x0.c:1.39 Tue Mar 7 01:28:37 2017
+++ src/sys/dev/ic/cs89x0.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0.c,v 1.39 2017/03/07 01:28:37 ozaki-r Exp $ */
+/* $NetBSD: cs89x0.c,v 1.39.6.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.39 2017/03/07 01:28:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.39.6.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -231,14 +231,13 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
+
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/ic/dm9000.c
diff -u src/sys/dev/ic/dm9000.c:1.11.8.1 src/sys/dev/ic/dm9000.c:1.11.8.2
--- src/sys/dev/ic/dm9000.c:1.11.8.1 Sat Aug 5 04:53:34 2017
+++ src/sys/dev/ic/dm9000.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.11.8.1 2017/08/05 04:53:34 snj Exp $ */
+/* $NetBSD: dm9000.c,v 1.11.8.2 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -102,14 +102,13 @@
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
+
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/intr.h>
@@ -651,8 +650,7 @@ dme_prepare(struct dme_softc *sc, struct
/* Element has now been removed from the queue, so we better send it */
- if (ifp->if_bpf)
- bpf_mtap(ifp, bufChain);
+ bpf_mtap(ifp, bufChain);
/* Setup the DM9000 to accept the writes, and then write each buf in
the chain. */
Index: src/sys/dev/ic/dp8390.c
diff -u src/sys/dev/ic/dp8390.c:1.87 src/sys/dev/ic/dp8390.c:1.87.2.1
--- src/sys/dev/ic/dp8390.c:1.87 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/dp8390.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.87 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: dp8390.c,v 1.87.2.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.87 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.87.2.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -45,9 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#ifdef IPKDB_DP8390
Index: src/sys/dev/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.140 src/sys/dev/ic/elink3.c:1.140.8.1
--- src/sys/dev/ic/elink3.c:1.140 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/elink3.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.140 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: elink3.c,v 1.140.8.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.140 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.140.8.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -83,9 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/cpu.h>
#include <sys/bus.h>
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.121 src/sys/dev/ic/elinkxl.c:1.121.6.1
--- src/sys/dev/ic/elinkxl.c:1.121 Mon Feb 20 07:43:29 2017
+++ src/sys/dev/ic/elinkxl.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.121 2017/02/20 07:43:29 ozaki-r Exp $ */
+/* $NetBSD: elinkxl.c,v 1.121.6.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.121 2017/02/20 07:43:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.121.6.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,9 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/cpu.h>
#include <sys/bus.h>
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.96.2.1 src/sys/dev/ic/hme.c:1.96.2.2
--- src/sys/dev/ic/hme.c:1.96.2.1 Wed May 9 15:21:02 2018
+++ src/sys/dev/ic/hme.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.96.2.1 2018/05/09 15:21:02 martin Exp $ */
+/* $NetBSD: hme.c,v 1.96.2.2 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.96.2.1 2018/05/09 15:21:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.96.2.2 2018/07/26 23:55:29 snj Exp $");
/* #define HMEDEBUG */
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.96
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <net/if_vlanvar.h>
@@ -68,10 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.96
#include <netinet/udp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/dev/ic/i82586.c
diff -u src/sys/dev/ic/i82586.c:1.76 src/sys/dev/ic/i82586.c:1.76.6.1
--- src/sys/dev/ic/i82586.c:1.76 Mon Feb 20 07:43:29 2017
+++ src/sys/dev/ic/i82586.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.76 2017/02/20 07:43:29 ozaki-r Exp $ */
+/* $NetBSD: i82586.c,v 1.76.6.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.76 2017/02/20 07:43:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.76.6.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
@@ -154,9 +154,7 @@ __KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/bus.h>
Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.52 src/sys/dev/ic/lance.c:1.52.8.1
--- src/sys/dev/ic/lance.c:1.52 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/lance.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.52 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: lance.c,v 1.52.8.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.52 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.52.8.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,10 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
Index: src/sys/dev/ic/mb86950.c
diff -u src/sys/dev/ic/mb86950.c:1.26 src/sys/dev/ic/mb86950.c:1.26.6.1
--- src/sys/dev/ic/mb86950.c:1.26 Mon Feb 20 07:43:29 2017
+++ src/sys/dev/ic/mb86950.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.26 2017/02/20 07:43:29 ozaki-r Exp $ */
+/* $NetBSD: mb86950.c,v 1.26.6.1 2018/07/26 23:55:29 snj Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.26 2017/02/20 07:43:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.26.6.1 2018/07/26 23:55:29 snj Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -136,6 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86950.c,v
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -145,10 +146,6 @@ __KERNEL_RCSID(0, "$NetBSD: mb86950.c,v
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/ic/mb86950reg.h>
Index: src/sys/dev/ic/mb86960.c
diff -u src/sys/dev/ic/mb86960.c:1.85 src/sys/dev/ic/mb86960.c:1.85.2.1
--- src/sys/dev/ic/mb86960.c:1.85 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/mb86960.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.85 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: mb86960.c,v 1.85.2.1 2018/07/26 23:55:29 snj Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.85 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.85.2.1 2018/07/26 23:55:29 snj Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86960.c,v
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -73,10 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: mb86960.c,v
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/ic/mb86960reg.h>
Index: src/sys/dev/ic/mtd803.c
diff -u src/sys/dev/ic/mtd803.c:1.33 src/sys/dev/ic/mtd803.c:1.33.8.1
--- src/sys/dev/ic/mtd803.c:1.33 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/mtd803.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803.c,v 1.33 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: mtd803.c,v 1.33.8.1 2018/07/26 23:55:29 snj Exp $ */
/*-
*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.33 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.33.8.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
@@ -58,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -67,9 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1
#include <netinet/ip.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/ic/mtd803reg.h>
Index: src/sys/dev/ic/pdq_ifsubr.c
diff -u src/sys/dev/ic/pdq_ifsubr.c:1.58 src/sys/dev/ic/pdq_ifsubr.c:1.58.8.1
--- src/sys/dev/ic/pdq_ifsubr.c:1.58 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/pdq_ifsubr.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.58 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.58.8.1 2018/07/26 23:55:29 snj Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.58 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.58.8.1 2018/07/26 23:55:29 snj Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -58,13 +58,11 @@ __KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#if !defined(__NetBSD__)
#include <net/route.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
Index: src/sys/dev/ic/rrunner.c
diff -u src/sys/dev/ic/rrunner.c:1.83 src/sys/dev/ic/rrunner.c:1.83.8.1
--- src/sys/dev/ic/rrunner.c:1.83 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/rrunner.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.83 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: rrunner.c,v 1.83.8.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.83 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.83.8.1 2018/07/26 23:55:29 snj Exp $");
#include "opt_inet.h"
@@ -62,6 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: rrunner.c,v
#include <net/if.h>
#include <net/if_dl.h>
#include <net/route.h>
+#include <net/bpf.h>
#include <net/if_hippi.h>
#include <net/if_media.h>
@@ -74,10 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: rrunner.c,v
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/cpu.h>
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/ic/seeq8005.c
diff -u src/sys/dev/ic/seeq8005.c:1.57 src/sys/dev/ic/seeq8005.c:1.57.8.1
--- src/sys/dev/ic/seeq8005.c:1.57 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/seeq8005.c Thu Jul 26 23:55:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.57 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: seeq8005.c,v 1.57.8.1 2018/07/26 23:55:29 snj Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.57 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.57.8.1 2018/07/26 23:55:29 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,9 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v
#include <net/if_types.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/rndsource.h>
Index: src/sys/dev/ic/sgec.c
diff -u src/sys/dev/ic/sgec.c:1.46 src/sys/dev/ic/sgec.c:1.46.2.1
--- src/sys/dev/ic/sgec.c:1.46 Mon May 22 17:23:49 2017
+++ src/sys/dev/ic/sgec.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sgec.c,v 1.46 2017/05/22 17:23:49 ragge Exp $ */
+/* $NetBSD: sgec.c,v 1.46.2.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.46 2017/05/22 17:23:49 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.46.2.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -53,13 +53,11 @@ __KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.4
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#include <netinet/in.h>
#include <netinet/if_inarp.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/ic/sgecreg.h>
Index: src/sys/dev/ic/smc90cx6.c
diff -u src/sys/dev/ic/smc90cx6.c:1.70.2.1 src/sys/dev/ic/smc90cx6.c:1.70.2.2
--- src/sys/dev/ic/smc90cx6.c:1.70.2.1 Sun Dec 10 10:10:23 2017
+++ src/sys/dev/ic/smc90cx6.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.70.2.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.70.2.2 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.70.2.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.70.2.2 2018/07/26 23:55:30 snj Exp $");
/* #define BAHSOFTCOPY */
#define BAHRETRANSMIT /**/
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v
#include <net/if_ether.h>
#include <net/if_types.h>
#include <net/if_arc.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -69,9 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/cpu.h>
Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.95 src/sys/dev/ic/smc91cxx.c:1.95.2.1
--- src/sys/dev/ic/smc91cxx.c:1.95 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/smc91cxx.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.95 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.95.2.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.95 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.95.2.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -94,6 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -103,9 +104,6 @@ __KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v
#include <netinet/ip.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii_bitbang.h>
Index: src/sys/dev/ic/tropic.c
diff -u src/sys/dev/ic/tropic.c:1.48 src/sys/dev/ic/tropic.c:1.48.8.1
--- src/sys/dev/ic/tropic.c:1.48 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/tropic.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.48 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: tropic.c,v 1.48.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.48 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.48.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -58,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1
#include <net/netisr.h>
#include <net/route.h>
#include <net/if_token.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -67,10 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1
#include <netinet/in_var.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/cpu.h>
#include <sys/bus.h>
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.243.6.1 src/sys/dev/ic/wi.c:1.243.6.2
--- src/sys/dev/ic/wi.c:1.243.6.1 Sun Dec 10 10:10:23 2017
+++ src/sys/dev/ic/wi.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.243.6.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: wi.c,v 1.243.6.2 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.243.6.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.243.6.2 2018/07/26 23:55:30 snj Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -126,6 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.243
#include <net/if_media.h>
#include <net/if_ether.h>
#include <net/route.h>
+#include <net/bpf.h>
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
@@ -133,9 +134,6 @@ __KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.243
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_rssadapt.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/isa/if_eg.c
diff -u src/sys/dev/isa/if_eg.c:1.92 src/sys/dev/isa/if_eg.c:1.92.8.1
--- src/sys/dev/isa/if_eg.c:1.92 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/isa/if_eg.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.92 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_eg.c,v 1.92.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <d...@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.92 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.92.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -58,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
+#include <net/bpf.h>
#include <net/if_ether.h>
@@ -69,10 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/cpu.h>
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/dev/isa/if_el.c
diff -u src/sys/dev/isa/if_el.c:1.94 src/sys/dev/isa/if_el.c:1.94.8.1
--- src/sys/dev/isa/if_el.c:1.94 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/isa/if_el.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.94 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_el.c,v 1.94.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.94 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.94.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
+#include <net/bpf.h>
#include <net/if_ether.h>
@@ -47,10 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/cpu.h>
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.100 src/sys/dev/isa/if_iy.c:1.100.6.1
--- src/sys/dev/isa/if_iy.c:1.100 Fri Mar 31 08:38:13 2017
+++ src/sys/dev/isa/if_iy.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: if_iy.c,v 1.100.6.1 2018/07/26 23:55:30 snj Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.100.6.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -59,12 +59,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#include <net/if_ether.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
Index: src/sys/dev/ofw/ofnet.c
diff -u src/sys/dev/ofw/ofnet.c:1.57 src/sys/dev/ofw/ofnet.c:1.57.8.1
--- src/sys/dev/ofw/ofnet.c:1.57 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ofw/ofnet.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.57 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: ofnet.c,v 1.57.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.57 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.57.8.1 2018/07/26 23:55:30 snj Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -49,15 +49,13 @@ __KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <dev/ofw/openfirm.h>
#if NIPKDB_OFN > 0
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.24.8.1 src/sys/dev/pci/if_alc.c:1.24.8.2
--- src/sys/dev/pci/if_alc.c:1.24.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_alc.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alc.c,v 1.24.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_alc.c,v 1.24.8.2 2018/07/26 23:55:30 snj Exp $ */
/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yong...@freebsd.org>
@@ -49,14 +49,13 @@
#include <sys/bus.h>
+#include <net/bpf.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_llc.h>
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <net/bpf.h>
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -67,8 +66,6 @@
#include <net/if_types.h>
#include <net/if_vlanvar.h>
-#include <net/bpf.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.150 src/sys/dev/pci/if_de.c:1.150.8.1
--- src/sys/dev/pci/if_de.c:1.150 Thu Dec 15 09:33:25 2016
+++ src/sys/dev/pci/if_de.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.150 2016/12/15 09:33:25 ozaki-r Exp $ */
+/* $NetBSD: if_de.c,v 1.150.8.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.150 2016/12/15 09:33:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.150.8.1 2018/07/26 23:55:30 snj Exp $");
#define TULIP_HDR_DATA
@@ -74,15 +74,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
+#include <net/bpf.h>
#if defined(__bsdi__) && _BSDI_VERSION >= 199701
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
Index: src/sys/dev/pci/if_fpa.c
diff -u src/sys/dev/pci/if_fpa.c:1.60 src/sys/dev/pci/if_fpa.c:1.60.10.1
--- src/sys/dev/pci/if_fpa.c:1.60 Sun Jan 25 07:33:24 2015
+++ src/sys/dev/pci/if_fpa.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.60 2015/01/25 07:33:24 martin Exp $ */
+/* $NetBSD: if_fpa.c,v 1.60.10.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.60 2015/01/25 07:33:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.60.10.1 2018/07/26 23:55:30 snj Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -58,9 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/route.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#if defined(__FreeBSD__)
#include <netinet/if_fddi.h>
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.31.8.1 src/sys/dev/pci/if_jme.c:1.31.8.2
--- src/sys/dev/pci/if_jme.c:1.31.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_jme.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.31.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_jme.c,v 1.31.8.2 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.31.8.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.31.8.2 2018/07/26 23:55:30 snj Exp $");
#include <sys/param.h>
@@ -83,9 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/rndsource.h>
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.107 src/sys/dev/pci/if_tl.c:1.107.2.1
--- src/sys/dev/pci/if_tl.c:1.107 Tue May 23 02:19:14 2017
+++ src/sys/dev/pci/if_tl.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.107 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: if_tl.c,v 1.107.2.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.107 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.107.2.1 2018/07/26 23:55:30 snj Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -61,9 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/rndsource.h>
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.17 src/sys/dev/pci/if_vte.c:1.17.2.1
--- src/sys/dev/pci/if_vte.c:1.17 Tue May 23 02:19:14 2017
+++ src/sys/dev/pci/if_vte.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.17 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: if_vte.c,v 1.17.2.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.17 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.17.2.1 2018/07/26 23:55:30 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,9 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
-
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#include <sys/rndsource.h>
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.24.6.12 src/sys/dev/pci/ixgbe/ixgbe.h:1.24.6.13
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.24.6.12 Sat Jun 9 14:59:43 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.24.6.12 2018/06/09 14:59:43 martin Exp $ */
+/* $NetBSD: ixgbe.h,v 1.24.6.13 2018/07/26 23:55:30 snj Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -89,7 +89,6 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/bpf.h>
#include <net/if_types.h>
#include <net/if_vlanvar.h>
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.61 src/sys/dev/pcmcia/if_cnw.c:1.61.8.1
--- src/sys/dev/pcmcia/if_cnw.c:1.61 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/pcmcia/if_cnw.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.61 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: if_cnw.c,v 1.61.8.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.61 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.61.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -129,6 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1
#include <net/if_dl.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -138,9 +139,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
/*
* Let these be patchable variables, initialized from macros that can
* be set in the kernel config file. Someone with lots of spare time
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.13.6.2 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.13.6.3
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.13.6.2 Sun Dec 10 10:10:24 2017
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmcia.c,v 1.13.6.2 2017/12/10 10:10:24 snj Exp $ */
+/* $NetBSD: if_malo_pcmcia.c,v 1.13.6.3 2018/07/26 23:55:30 snj Exp $ */
/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.13.6.2 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.13.6.3 2018/07/26 23:55:30 snj Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -522,8 +522,7 @@ cmalo_start(struct ifnet *ifp)
IFQ_DEQUEUE(&ifp->if_snd, m);
- if (ifp->if_bpf)
- bpf_ops->bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp, m);
if (cmalo_tx(sc, m) != 0)
ifp->if_oerrors++;
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.86 src/sys/dev/pcmcia/if_ray.c:1.86.8.1
--- src/sys/dev/pcmcia/if_ray.c:1.86 Fri Jan 13 14:48:18 2017
+++ src/sys/dev/pcmcia/if_ray.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.86 2017/01/13 14:48:18 maya Exp $ */
+/* $NetBSD: if_ray.c,v 1.86.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.86 2017/01/13 14:48:18 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.86.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -80,6 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1
#include <net80211/ieee80211.h>
#include <net80211/ieee80211_ioctl.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -89,9 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/cpu.h>
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.80 src/sys/dev/pcmcia/if_xi.c:1.80.8.1
--- src/sys/dev/pcmcia/if_xi.c:1.80 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/pcmcia/if_xi.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.80 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: if_xi.c,v 1.80.8.1 2018/07/26 23:55:30 snj Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.80 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.80.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.
#include <net/if_media.h>
#include <net/if_types.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -83,9 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
/*
* Maximum number of bytes to read per interrupt. Linux recommends
* somewhere between 2000-22000.
Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.50 src/sys/dev/pcmcia/mhzc.c:1.50.30.1
--- src/sys/dev/pcmcia/mhzc.c:1.50 Sat Oct 27 17:18:37 2012
+++ src/sys/dev/pcmcia/mhzc.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.50 2012/10/27 17:18:37 chs Exp $ */
+/* $NetBSD: mhzc.c,v 1.50.30.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.50 2012/10/27 17:18:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.50.30.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.5
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -69,10 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.5
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.33 src/sys/dev/pcmcia/xirc.c:1.33.40.1
--- src/sys/dev/pcmcia/xirc.c:1.33 Tue Feb 14 13:51:19 2012
+++ src/sys/dev/pcmcia/xirc.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $ */
+/* $NetBSD: xirc.c,v 1.33.40.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.33.40.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.3
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -59,10 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.3
#include <netinet/if_inarp.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/dev/qbus/if_de.c
diff -u src/sys/dev/qbus/if_de.c:1.32 src/sys/dev/qbus/if_de.c:1.32.2.1
--- src/sys/dev/qbus/if_de.c:1.32 Mon May 22 17:22:29 2017
+++ src/sys/dev/qbus/if_de.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $ */
+/* $NetBSD: if_de.c,v 1.32.2.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.32.2.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -90,15 +90,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
Index: src/sys/dev/qbus/if_qe.c
diff -u src/sys/dev/qbus/if_qe.c:1.77 src/sys/dev/qbus/if_qe.c:1.77.2.1
--- src/sys/dev/qbus/if_qe.c:1.77 Mon May 22 17:22:29 2017
+++ src/sys/dev/qbus/if_qe.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.77 2017/05/22 17:22:29 ragge Exp $ */
+/* $NetBSD: if_qe.c,v 1.77.2.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.77 2017/05/22 17:22:29 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.77.2.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -46,13 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_dl.h>
+#include <net/bpf.h>
#include <netinet/in.h>
#include <netinet/if_inarp.h>
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
Index: src/sys/dev/qbus/if_qt.c
diff -u src/sys/dev/qbus/if_qt.c:1.21 src/sys/dev/qbus/if_qt.c:1.21.8.1
--- src/sys/dev/qbus/if_qt.c:1.21 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/qbus/if_qt.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qt.c,v 1.21 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: if_qt.c,v 1.21.8.1 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1992 Steven M. Schultz
* All rights reserved.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.21 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.21.8.1 2018/07/26 23:55:30 snj Exp $");
#include "opt_inet.h"
@@ -100,6 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.
#include <net/if_ether.h>
#include <net/netisr.h>
#include <net/route.h>
+#include <net/bpf.h>
#ifdef INET
#include <sys/domain.h>
@@ -109,10 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.
#include <netinet/ip.h>
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
-
#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.85.8.1 src/sys/dev/sbus/be.c:1.85.8.2
--- src/sys/dev/sbus/be.c:1.85.8.1 Mon Feb 26 13:45:11 2018
+++ src/sys/dev/sbus/be.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.85.8.1 2018/02/26 13:45:11 martin Exp $ */
+/* $NetBSD: be.c,v 1.85.8.2 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.85.8.1 2018/02/26 13:45:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.85.8.2 2018/07/26 23:55:30 snj Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -80,6 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.85.
#include <net/netisr.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -89,10 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.85.
#include <netinet/ip.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/intr.h>
#include <machine/autoconf.h>
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.67 src/sys/dev/sbus/qe.c:1.67.8.1
--- src/sys/dev/sbus/qe.c:1.67 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/sbus/qe.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.67 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: qe.c,v 1.67.8.1 2018/07/26 23:55:30 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.67 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.67.8.1 2018/07/26 23:55:30 snj Exp $");
#define QEDEBUG
@@ -90,6 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.67
#include <net/netisr.h>
#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -99,10 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.67
#include <netinet/ip.h>
#endif
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <sys/bus.h>
#include <sys/intr.h>
#include <machine/autoconf.h>
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.94.8.1 src/sys/dev/scsipi/if_se.c:1.94.8.2
--- src/sys/dev/scsipi/if_se.c:1.94.8.1 Sun Dec 10 10:10:24 2017
+++ src/sys/dev/scsipi/if_se.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.94.8.1 2017/12/10 10:10:24 snj Exp $ */
+/* $NetBSD: if_se.c,v 1.94.8.2 2018/07/26 23:55:30 snj Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.94.8.1 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.94.8.2 2018/07/26 23:55:30 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -95,6 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/bpf.h>
#ifdef INET
#include <netinet/in.h>
@@ -107,9 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.
#endif
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#define SETIMEOUT 1000
#define SEOUTSTANDING 4
#define SERETRIES 4
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.55.8.1 src/sys/dev/usb/if_atu.c:1.55.8.2
--- src/sys/dev/usb/if_atu.c:1.55.8.1 Wed Jan 31 18:01:54 2018
+++ src/sys/dev/usb/if_atu.c Thu Jul 26 23:55:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.55.8.1 2018/01/31 18:01:54 martin Exp $ */
+/* $NetBSD: if_atu.c,v 1.55.8.2 2018/07/26 23:55:30 snj Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.55.8.1 2018/01/31 18:01:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.55.8.2 2018/07/26 23:55:30 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -79,8 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1
#include <dev/microcode/atmel/atmel_rfmd_fw.h>
#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.11.2.8 src/sys/net/if_l2tp.c:1.11.2.9
--- src/sys/net/if_l2tp.c:1.11.2.8 Thu May 17 14:07:03 2018
+++ src/sys/net/if_l2tp.c Thu Jul 26 23:55:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.11.2.8 2018/05/17 14:07:03 martin Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.11.2.9 2018/07/26 23:55:31 snj Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.8 2018/05/17 14:07:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.9 2018/07/26 23:55:31 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -92,7 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v
#include <netinet/ip_tcpmss.h>
#endif
-#include <net/bpf.h>
#include <net/net_osdep.h>
/*
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.158 src/sys/net/if_ppp.c:1.158.8.1
--- src/sys/net/if_ppp.c:1.158 Sun Oct 2 14:17:07 2016
+++ src/sys/net/if_ppp.c Thu Jul 26 23:55:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $ */
+/* $NetBSD: if_ppp.c,v 1.158.8.1 2018/07/26 23:55:31 snj Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158.8.1 2018/07/26 23:55:31 snj Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -139,9 +139,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#include <net/if_types.h>
#include <net/netisr.h>
#include <net/route.h>
-#ifdef PPP_FILTER
-#include <net/bpf.h>
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -151,7 +148,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#endif
#include <net/bpf.h>
-
#include <net/slip.h>
#ifdef VJC
