for ethernet ifaces attach bpf from ether_ifattach; jason@, aaron@, itojun@ ok

11 files changed, 11 insertions, 54 deletions

diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 7e9e01b71d0..2ad72b6d600 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990.c,v 1.19 2000/03/15 14:37:49 deraadt Exp $	*/
+/*	$OpenBSD: am7990.c,v 1.20 2001/02/20 19:39:36 mickey Exp $	*/
 /*	$NetBSD: am7990.c,v 1.22 1996/10/13 01:37:19 christos Exp $	*/
 
 /*-
@@ -153,10 +153,6 @@ am7990_config(sc)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
-
 	if (sc->sc_memsize > 262144)
 		sc->sc_memsize = 262144;
 
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 3070470c45a..22bf5997d1c 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.10 2001/01/10 17:50:15 angelos Exp $	*/
+/*	$OpenBSD: an.c,v 1.11 2001/02/20 19:39:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -132,7 +132,7 @@
 #define TIMEOUT(handle,func,sc,time) timeout_add(&(handle), (time))
 #define UNTIMEOUT(func,sc,handle) timeout_del(&(handle))
 #define BPF_MTAP(if,mbuf) bpf_mtap((if)->if_bpf, (mbuf))
-#define BPFATTACH(if_bpf,if,dlt,sz) bpfattach((if_bpf), (if), (dlt), (sz))
+#define BPFATTACH(if_bpf,if,dlt,sz)
 
 struct cfdriver an_cd = {
 	NULL, "an", DV_IFNET
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index 11551ce322f..ab6a27f7d15 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -331,9 +331,6 @@ awi_attach(sc)
 	if_attach(ifp);
 #ifdef __OpenBSD__
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 #elif defined(__FreeBSD__)
 	ether_ifattach(ifp);
 #if NBPFILTER > 0
@@ -341,9 +338,6 @@ awi_attach(sc)
 #endif
 #elif defined(__NetBSD__)
 	ether_ifattach(ifp, sc->sc_mib_addr.aMAC_Address);
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 #endif
 
 #ifdef IFM_IEEE80211
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 7021e2d2d09..1282bcdbbca 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.23 2001/02/09 05:14:08 art Exp $	*/
+/*	$OpenBSD: dc.c,v 1.24 2001/02/20 19:39:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1714,10 +1714,6 @@ void dc_attach_common(sc)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
-	bpfattach(&sc->arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
 	shutdownhook_establish(dc_shutdown, sc);
 
 fail:
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index f3e717fb121..e66847ca392 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.8 2000/05/29 17:08:51 fgsch Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.9 2001/02/20 19:39:37 mickey Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -143,10 +143,6 @@ dp8390_config(sc, media, nmedia, defmedia)
 	/* Attach the interface. */
 	if_attach(ifp);
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
-	bpfattach(&sc->sc_arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-		sizeof(struct ether_header));
-#endif
 
 	/* Print additional info when attached. */
 	printf("%s: address %s\n", sc->sc_dev.dv_xname,
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index cde33457cc4..718203de636 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.46 2000/11/09 18:06:38 mickey Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.47 2001/02/20 19:39:36 mickey Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -438,11 +438,6 @@ epconfig(sc, chipset, enaddr)
 
 	GO_WINDOW(1);		/* Window 1 is operating window */
 
-#if NBPFILTER > 0
-	bpfattach(&sc->sc_arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
-
 	sc->tx_start_thresh = 20;	/* probably a good starting point. */
 
 	ep_reset_cmd(sc, EP_COMMAND, RX_RESET);
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index ea2c4074b5b..e6f3e4a125b 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.10 2000/10/16 17:08:07 aaron Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.11 2001/02/20 19:39:38 mickey Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -403,10 +403,6 @@ fxp_attach_common(sc, enaddr, intrstr)
 	 */
 	ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
-	bpfattach(&sc->arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
 
 	/*
 	 * Add shutdown hook so that DMA is disabled prior to reboot. Not
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 0272b15385d..ef3d1bb1e37 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.3 2001/01/12 22:56:03 mickey Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.4 2001/02/20 19:39:37 mickey Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -347,10 +347,6 @@ i82596_attach(sc, name, etheraddr, media, nmedia, defmedia)
 
 	printf(" %s v%d.%d, address %s\n", name, sc->sc_vers / 10,
 	       sc->sc_vers % 10, ether_sprintf(etheraddr));
-
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 }
 
 
diff --git a/sys/dev/ic/rln.c b/sys/dev/ic/rln.c
index 7582c4789a2..376983970c7 100644
--- a/sys/dev/ic/rln.c
+++ b/sys/dev/ic/rln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rln.c,v 1.8 2000/12/13 15:58:39 mickey Exp $	*/
+/*	$OpenBSD: rln.c,v 1.9 2001/02/20 19:39:37 mickey Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public Domain.
  *
@@ -145,9 +145,6 @@ rlnconfig(sc)
 	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
 	if_attach(ifp);
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof (struct ether_header));
-#endif
 }
 
 /* Bring device up. */
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 9891b779737..2ac0a297b3a 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.7 2000/02/02 19:09:58 fgsch Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.8 2001/02/20 19:39:36 mickey Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -268,11 +268,6 @@ smc91cxx_attach(sc, myea)
 		ifmedia_add(&sc->sc_media, smc91cxx_media[i], 0, NULL);
 	ifmedia_set(&sc->sc_media, IFM_ETHER | (aui ? IFM_10_5 : IFM_10_T));
 
-#if NBPFILTER > 0
-	bpfattach(&sc->sc_arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-		sizeof(struct ether_header));
-#endif
-
 #if NRND > 0
 	rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_NET);
 #endif
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index d2dad6fd6da..2088477cbda 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.20 2001/02/02 08:35:31 aaron Exp $	*/
+/*	$OpenBSD: xl.c,v 1.21 2001/02/20 19:39:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2634,10 +2634,6 @@ xl_attach(sc)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
-	bpfattach(&sc->arpcom.ac_if.if_bpf, ifp,
-	    DLT_EN10MB, sizeof(struct ether_header));
-#endif
 	sc->sc_sdhook = shutdownhook_establish(xl_shutdown, sc);
 }