summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_devar.h7
-rw-r--r--sys/dev/pci/if_rl.c7
-rw-r--r--sys/dev/pci/if_sf.c6
-rw-r--r--sys/dev/pci/if_sis.c6
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/if_ste.c6
-rw-r--r--sys/dev/pci/if_ti.c7
-rw-r--r--sys/dev/pci/if_tl.c6
-rw-r--r--sys/dev/pci/if_tx.c6
-rw-r--r--sys/dev/pci/if_vr.c6
-rw-r--r--sys/dev/pci/if_wb.c6
-rw-r--r--sys/dev/pci/if_wx.c4
12 files changed, 18 insertions, 55 deletions
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 0f13e025335..1bc0bd48bfc 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_devar.h,v 1.10 2001/02/03 06:10:18 mickey Exp $ */
+/* $OpenBSD: if_devar.h,v 1.11 2001/02/20 19:39:42 mickey Exp $ */
/* $NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $ */
/*-
@@ -952,6 +952,11 @@ extern struct cfdriver de_cd;
#define tulip_xname tulip_if.if_xname
#endif
+#if NBPFILTER > 0
+#define TULIP_BPF_MTAP(sc, m) bpf_mtap((sc)->tulip_if.if_bpf, m)
+#define TULIP_BPF_TAP(sc, p, l) bpf_tap((sc)->tulip_if.if_bpf, p, l)
+#define TULIP_BPF_ATTACH(sc)
+#endif
#define TULIP_RAISESPL() splnet()
#define TULIP_RAISESOFTSPL() splsoftnet()
#define TULIP_RESTORESPL(s) splx(s)
diff --git a/sys/dev/pci/if_rl.c b/sys/dev/pci/if_rl.c
index 7b0bb6a1007..773bb4cb27e 100644
--- a/sys/dev/pci/if_rl.c
+++ b/sys/dev/pci/if_rl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rl.c,v 1.25 2001/02/20 19:10:14 jason Exp $ */
+/* $OpenBSD: if_rl.c,v 1.26 2001/02/20 19:39:43 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1409,11 +1409,6 @@ rl_attach(parent, self, aux)
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(rl_shutdown, sc);
}
diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c
index c3f7168e35b..1d58c510e84 100644
--- a/sys/dev/pci/if_sf.c
+++ b/sys/dev/pci/if_sf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sf.c,v 1.9 2001/02/03 05:59:17 mickey Exp $ */
+/* $OpenBSD: if_sf.c,v 1.10 2001/02/20 19:39:44 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -764,10 +764,6 @@ void sf_attach(parent, self, aux)
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(sf_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index f565377b23f..c86e4d561a8 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sis.c,v 1.9 2001/02/20 19:15:19 jason Exp $ */
+/* $OpenBSD: if_sis.c,v 1.10 2001/02/20 19:39:45 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -787,10 +787,6 @@ void sis_attach(parent, self, aux)
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(sis_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 609e157022d..66a5d54671c 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.9 2000/10/16 17:08:08 aaron Exp $ */
+/* $OpenBSD: if_sk.c,v 1.10 2001/02/20 19:39:45 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -989,10 +989,6 @@ sk_attach(parent, self, aux)
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
- bpfattach(&sc_if->arpcom.ac_if.if_bpf, ifp,
- DLT_EN10MB, sizeof(struct ether_header));
-#endif
return;
fail:
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 7b9e5471954..9a136100a37 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ste.c,v 1.9 2001/02/03 05:56:14 mickey Exp $ */
+/* $OpenBSD: if_ste.c,v 1.10 2001/02/20 19:39:45 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -1011,10 +1011,6 @@ void ste_attach(parent, self, aux)
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(ste_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index bab8cb7698b..b97bfc3f05d 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ti.c,v 1.14 2000/11/21 03:50:48 jason Exp $ */
+/* $OpenBSD: if_ti.c,v 1.15 2001/02/20 19:39:43 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -1720,11 +1720,6 @@ ti_attach(parent, self, aux)
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(ti_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 20c568085c2..5dab7321d90 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tl.c,v 1.16 2001/02/03 05:52:27 mickey Exp $ */
+/* $OpenBSD: if_tl.c,v 1.17 2001/02/20 19:39:43 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -2655,10 +2655,6 @@ tl_attach(parent, self, aux)
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(tl_shutdown, sc);
}
diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c
index 3972637b47b..13873d386b6 100644
--- a/sys/dev/pci/if_tx.c
+++ b/sys/dev/pci/if_tx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tx.c,v 1.11 2000/10/17 15:47:12 jason Exp $ */
+/* $OpenBSD: if_tx.c,v 1.12 2001/02/20 19:39:43 mickey Exp $ */
/* $FreeBSD: src/sys/pci/if_tx.c,v 1.40 2000/07/13 22:54:34 archie Exp $ */
/*-
@@ -338,10 +338,6 @@ epic_openbsd_attach(
/* Attach os interface and bpf */
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
- bpfattach(&sc->sc_if.if_bpf, ifp, DLT_EN10MB,
- sizeof(struct ether_header));
-#endif
/* Set shutdown routine to stop DMA process */
shutdownhook_establish(epic_openbsd_shutdown, sc);
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index d81fd827c97..11dc48835a5 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vr.c,v 1.12 2001/02/20 19:12:47 jason Exp $ */
+/* $OpenBSD: if_vr.c,v 1.13 2001/02/20 19:39:44 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -784,10 +784,6 @@ vr_attach(parent, self, aux)
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(vr_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index f04b87cbc42..a2bdabd5656 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wb.c,v 1.7 2001/02/03 05:37:18 mickey Exp $ */
+/* $OpenBSD: if_wb.c,v 1.8 2001/02/20 19:39:44 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -930,10 +930,6 @@ wb_attach(parent, self, aux)
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(wb_shutdown, sc);
fail:
diff --git a/sys/dev/pci/if_wx.c b/sys/dev/pci/if_wx.c
index 3dd4a3d7835..42fd975f658 100644
--- a/sys/dev/pci/if_wx.c
+++ b/sys/dev/pci/if_wx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wx.c,v 1.9 2001/01/29 04:33:59 deraadt Exp $ */
+/* $OpenBSD: if_wx.c,v 1.10 2001/02/20 19:39:44 mickey Exp $ */
/*
* Copyright (c) 1999, Traakan Software
* All rights reserved.
@@ -294,12 +294,12 @@ wx_attach(parent, self, aux)
ether_ifattach(ifp);
#else
ether_ifattach(ifp, sc->wx_enaddr);
-#endif
#if NBPFILTER > 0
bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB,
sizeof (struct ether_header));
#endif
+#endif
/*
* Add shutdown hook so that DMA is disabled prior to reboot. Not
* doing do could allow DMA to corrupt kernel memory during the
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 06:40:07 +0000