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

9 files changed, 9 insertions, 63 deletions

diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 701f4296ee1..bbfb6d5642c 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.41 1999/02/28 03:23:37 jason Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.42 2001/02/20 19:39:39 mickey Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $	*/
 
 /*
@@ -518,12 +518,6 @@ ed_pci_attach(parent, self, aux)
 		printf("type unknown (0x%x) ", sc->type);
 	printf("%s", sc->isa16bit ? "(16-bit)" : "(8-bit)");	/* XXX */
 
-#if NBPFILTER > 0
-        if ((sc->spec_flags & ED_REATTACH) == 0)
-		bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB,
-		    sizeof(struct ether_header));
-#endif
-
 	/* Map and establish the interrupt. */
 	if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin,
 	    pa->pa_intrline, &ih)) {
@@ -1715,12 +1709,6 @@ edattach(parent, self, aux)
 
 	printf("\n");
 
-#if NBPFILTER > 0
-	if ((sc->spec_flags & ED_REATTACH) == 0)
-		bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB,
-			  sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, edintr, sc, sc->sc_dev.dv_xname);
 	sc->sc_sh = shutdownhook_establish((void (*)(void *))edstop, sc);
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index 9e25f87b05d..fa76958d17c 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.9 2000/11/11 23:49:20 mickey Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.10 2001/02/20 19:39:41 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -235,11 +235,6 @@ ef_isapnp_attach(parent, self, aux)
 	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
-
 	sc->sc_tx_start_thresh = 20;
 
 	efcompletecmd(sc, EP_COMMAND, RX_RESET);
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index cdf954728b7..e830fed97eb 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.16 2000/06/05 20:56:20 niklas Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.17 2001/02/20 19:39:39 mickey Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -451,10 +451,6 @@ egattach(parent, self, aux)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 	
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, egintr, sc, sc->sc_dev.dv_xname);
 }
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index fa80836748c..317d045e8f9 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.12 1999/02/28 03:23:37 jason Exp $       */
+/*    $OpenBSD: if_el.c,v 1.13 2001/02/20 19:39:40 mickey Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -200,12 +200,6 @@ elattach(parent, self, aux)
 	/* Print out some information for the user. */
 	printf(": address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr));
 
-	/* Finally, attach to bpf filter if it is present. */
-#if NBPFILTER > 0
-	dprintf(("Attaching to BPF...\n"));
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, elintr, sc, sc->sc_dev.dv_xname);
 
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index b2fc9a70174..7b12438e32b 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ex.c,v 1.5 1999/04/19 07:10:06 fgsch Exp $	*/
+/*	$OpenBSD: if_ex.c,v 1.6 2001/02/20 19:39:40 mickey Exp $	*/
 /*
  * Copyright (c) 1997, Donald A. Schmidt
  * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -309,14 +309,6 @@ ex_attach(parent, self, aux)
 		default: printf("???\n");
 	}
 
-	/*
-	 * If BPF is in the kernel, call the attach for it
-	 */
-#if NBPFILTER > 0
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, 
-	    sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, exintr, sc, self->dv_xname);
 	ex_init(sc);
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 277607a02f4..892983c055b 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fe.c,v 1.12 1999/02/28 03:23:38 jason Exp $	*/
+/*	$OpenBSD: if_fe.c,v 1.13 2001/02/20 19:39:40 mickey Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -1121,11 +1121,6 @@ feattach(parent, self, aux)
 	}
 #endif
 
-#if NBPFILTER > 0
-	/* If BPF is in the kernel, call the attach for it. */
-	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, feintr, sc, sc->sc_dev.dv_xname);
 }
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index f231063509d..1b44642d988 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_hp.c,v 1.5 1999/02/28 03:23:38 jason Exp $       */
+/*    $OpenBSD: if_hp.c,v 1.6 2001/02/20 19:39:41 mickey Exp $       */
 /*    $NetBSD: if_hp.c,v 1.21 1995/12/24 02:31:31 mycroft Exp $       */
 
 /* XXX THIS DRIVER IS BROKEN.  IT WILL NOT EVEN COMPILE. */
@@ -412,11 +412,6 @@ hpattach(dvp)
 	ifp->if_reset = hpreset;
 	ifp->if_watchdog = 0;
 	if_attach(ifp);
-
-#if NBPFILTER > 0
-	bpfattach(&ns->ns_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
 }
 /*
  * Initialization of interface; set up initialization block
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 498abccba35..51310480477 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.19 2001/02/03 05:09:48 mickey Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.20 2001/02/20 19:39:41 mickey Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -803,11 +803,6 @@ ieattach(parent, self, aux)
 	    ether_sprintf(sc->sc_arpcom.ac_enaddr),
 	    ie_hardware_names[sc->hard_type], sc->hard_vers + 1);
 
-#if NBPFILTER > 0
-	bpfattach(&sc->sc_arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
-
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, ieintr, sc, sc->sc_dev.dv_xname);
 }
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index fb38d14315c..8382dca98bf 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iy.c,v 1.5 2001/02/03 05:16:42 mickey Exp $	*/
+/*	$OpenBSD: if_iy.c,v 1.6 2001/02/20 19:39:41 mickey Exp $	*/
 /*	$NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
@@ -305,10 +305,6 @@ iyattach(parent, self, aux)
 	printf(": address %s, chip rev. %d, %d kB SRAM\n",
 	    ether_sprintf(sc->sc_arpcom.ac_enaddr),
 	    sc->hard_vers, sc->sram/1024);
-#if NBPFILTER > 0
-	bpfattach(&sc->sc_arpcom.ac_if.if_bpf, ifp, DLT_EN10MB,
-	    sizeof(struct ether_header));
-#endif
 
 	timeout_set(&sc->sc_tmo, iymbuffill, sc);
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,