Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Adapt to bpfattach() changes, and further centralize the...
details: https://anonhg.NetBSD.org/src/rev/6ab39ae33403
branches: trunk
changeset: 500479:6ab39ae33403
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Dec 12 18:00:22 2000 +0000
description:
Adapt to bpfattach() changes, and further centralize the bpfattach()
and bpfdetach() calls into link-type subroutines where possible.
diffstat:
sys/arch/alpha/a12/if_xb.c | 8 ++++----
sys/dev/ic/hd64570.c | 12 ++++++------
sys/dev/ic/hd64570var.h | 6 +-----
sys/dev/ic/midway.c | 8 +-------
sys/dev/ic/pdq_ifsubr.c | 5 +----
sys/dev/ic/rrunner.c | 6 +-----
sys/dev/ic/smc90cx6.c | 5 +----
sys/dev/ic/tropic.c | 10 +---------
sys/dev/ieee1394/if_fw.c | 8 +-------
sys/dev/pci/if_lmcvar.h | 4 ++--
sys/dev/usb/if_upl.c | 4 ++--
sys/net/if_arcsubr.c | 12 +++++++++++-
sys/net/if_atmsubr.c | 7 ++++++-
sys/net/if_ethersubr.c | 4 ++--
sys/net/if_faith.c | 6 +-----
sys/net/if_fddisubr.c | 11 ++++++++++-
sys/net/if_gif.c | 6 +-----
sys/net/if_gre.c | 8 ++++----
sys/net/if_gre.h | 3 +--
sys/net/if_hippisubr.c | 12 +++++++++++-
sys/net/if_ieee1394subr.c | 8 +++++++-
sys/net/if_loop.c | 4 ++--
sys/net/if_ppp.c | 12 ++++++------
sys/net/if_pppvar.h | 3 +--
sys/net/if_sl.c | 4 ++--
sys/net/if_stf.c | 6 +-----
sys/net/if_strip.c | 16 ++++++++--------
sys/net/if_stripvar.h | 4 +---
sys/net/if_tokensubr.c | 15 +++++++++++++--
sys/net/if_tun.c | 12 ++++++------
sys/net/if_tun.h | 5 +----
sys/net/ppp_tty.c | 6 +++---
sys/netinet/ip_gre.c | 10 +++++-----
sys/netinet/ip_ipip.c | 5 ++---
34 files changed, 126 insertions(+), 129 deletions(-)
diffs (truncated from 979 to 300 lines):
diff -r 3eb770757457 -r 6ab39ae33403 sys/arch/alpha/a12/if_xb.c
--- a/sys/arch/alpha/a12/if_xb.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/arch/alpha/a12/if_xb.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.c,v 1.3 2000/06/29 09:02:52 mrg Exp $ */
+/* $NetBSD: if_xb.c,v 1.4 2000/12/12 18:00:22 thorpej Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -74,7 +74,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.3 2000/06/29 09:02:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.4 2000/12/12 18:00:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,7 +234,7 @@
xbfound = 1;
ccp = &xb_configuration;
xb_init_config(ccp, 1);
- printf(": driver %s mtu %d\n", "$Revision: 1.3 $", xbi.if_mtu);
+ printf(": driver %s mtu %d\n", "$Revision: 1.4 $", xbi.if_mtu);
}
static void
@@ -776,6 +776,6 @@
/* xbi.if_broadcastaddr = (u_int8_t)&xbar_bc_addr; */
#if NBPFILTER > 0
- bpfattach(&xbi.if_bpf, &xbi, DLT_NULL, 0);
+ bpfattach(&xbi, DLT_NULL, 0);
#endif
}
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/hd64570.c
--- a/sys/dev/ic/hd64570.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/hd64570.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.11 2000/01/09 17:32:58 chopps Exp $ */
+/* $NetBSD: hd64570.c,v 1.12 2000/12/12 18:00:23 thorpej Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -455,7 +455,7 @@
if_attach(ifp);
#if NBPFILTER > 0
- bpfattach(&scp->sp_bpf, ifp, DLT_HDLC, HDLC_HDRLEN);
+ bpfattach(ifp, DLT_HDLC, HDLC_HDRLEN);
#endif
if (sc->sc_parent == NULL)
@@ -1097,8 +1097,8 @@
/*
* Pass packet to bpf if there is a listener.
*/
- if (scp->sp_bpf)
- bpf_mtap(scp->sp_bpf, mb_head);
+ if (ifp->if_bpf)
+ bpf_mtap(ifp->if_bpf, mb_head);
#endif
m_freem(mb_head);
@@ -1559,8 +1559,8 @@
}
#if NBPFILTER > 0
- if (scp->sp_bpf)
- bpf_mtap(scp->sp_bpf, m);
+ if (scp->sp_if.if_bpf)
+ bpf_mtap(scp->sp_if.if_bpf, m);
#endif
scp->sp_if.if_ipackets++;
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/hd64570var.h
--- a/sys/dev/ic/hd64570var.h Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/hd64570var.h Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570var.h,v 1.3 2000/01/04 06:36:29 chopps Exp $ */
+/* $NetBSD: hd64570var.h,v 1.4 2000/12/12 18:00:23 thorpej Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -132,10 +132,6 @@
struct ifqueue fastq; /* interactive packets */
#endif
-#if NBPFILTER > 0
- caddr_t sp_bpf; /* hook for BPF */
-#endif
-
struct sca_softc *sca; /* pointer to parent */
};
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/midway.c
--- a/sys/dev/ic/midway.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/midway.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: midway.c,v 1.46 2000/10/10 10:15:00 itojun Exp $ */
+/* $NetBSD: midway.c,v 1.47 2000/12/12 18:00:23 thorpej Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -906,9 +906,6 @@
if_attach(ifp);
atm_ifattach(ifp);
-#if NBPFILTER > 0
- BPFATTACH(ifp, DLT_ATM_RFC1483, sizeof(struct atmllc));
-#endif
#ifdef ATM_PVCEXT
rrp_add(sc, ifp);
#endif
@@ -3736,9 +3733,6 @@
if_attach(pvc_ifp);
atm_ifattach(pvc_ifp);
-#if NBPFILTER > 0
- BPFATTACH(pvc_ifp, DLT_ATM_RFC1483, sizeof(struct atmllc));
-#endif
#ifdef ATM_PVCEXT
rrp_add(sc, pvc_ifp);
#endif
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/pdq_ifsubr.c
--- a/sys/dev/ic/pdq_ifsubr.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/pdq_ifsubr.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.28 2000/06/28 17:13:02 mrg Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.29 2000/12/12 18:00:23 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -575,9 +575,6 @@
#else
fddi_ifattach(ifp);
#endif
-#if NBPFILTER > 0
- PDQ_BPFATTACH(sc, DLT_FDDI, sizeof(struct fddi_header));
-#endif
}
#if defined(PDQ_BUS_DMA)
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/rrunner.c
--- a/sys/dev/ic/rrunner.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/rrunner.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.19 2000/07/06 01:47:38 thorpej Exp $ */
+/* $NetBSD: rrunner.c,v 1.20 2000/12/12 18:00:24 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -420,10 +420,6 @@
sc->sc_misaligned_bufs = sc->sc_bad_lens = 0;
sc->sc_fp_rings = 0;
-#if NBPFILTER > 0
- bpfattach(&sc->sc_if.if_bpf, ifp, DLT_HIPPI,
- sizeof(struct hippi_header));
-#endif
return;
bad_ring_dmamap_create:
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/smc90cx6.c
--- a/sys/dev/ic/smc90cx6.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/smc90cx6.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.35 2000/03/30 12:45:32 augustss Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.36 2000/12/12 18:00:24 thorpej Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -210,9 +210,6 @@
arc_ifattach(ifp, linkaddress);
-#if NBPFILTER > 0
- bpfattach(&ifp->if_bpf, ifp, DLT_ARCNET, ARC_HDRLEN);
-#endif
#ifdef BAHSOFTCOPY
sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, bah_srint, sc);
sc->sc_txcookie = softintr_establish(IPL_SOFTNET,
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ic/tropic.c
--- a/sys/dev/ic/tropic.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ic/tropic.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.14 2000/10/31 01:22:08 mjl Exp $ */
+/* $NetBSD: tropic.c,v 1.15 2000/12/12 18:00:24 thorpej Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -439,10 +439,6 @@
printf("%s: address %s ring speed %d Mbps\n", sc->sc_dev.dv_xname,
token_sprintf(myaddr), (sc->sc_init_status & RSP_16) ? 16 : 4);
-#if NBPFILTER > 0
- bpfattach(&ifp->if_bpf, ifp, DLT_IEEE802, sizeof(struct token_header));
-#endif
-
callout_init(&sc->sc_init_callout);
callout_init(&sc->sc_reinit_callout);
@@ -1821,10 +1817,6 @@
/* Delete all remaining media. */
ifmedia_delete_instance(&sc->sc_media, IFM_INST_ANY);
-#if NBPFILTER > 0
- bpfdetach(ifp);
-#endif
-
token_ifdetach(ifp);
if_detach(ifp);
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/ieee1394/if_fw.c
--- a/sys/dev/ieee1394/if_fw.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/ieee1394/if_fw.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fw.c,v 1.2 2000/11/10 03:45:09 enami Exp $ */
+/* $NetBSD: if_fw.c,v 1.3 2000/12/12 18:00:24 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -167,9 +167,6 @@
printf(": Id %s\n", ieee1394_sprintf(sc->sc_ic.ic_hwaddr.iha_uid));
if_attach(ifp);
ieee1394_ifattach(ifp, &sc->sc_ic.ic_hwaddr);
-#if NBPFILTER > 0
- bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, 14); /*XXX*/
-#endif
(*psc->sc1394_ifinreg)
(sc->sc_dev.dv_parent, FW_FIFO_HI, FW_FIFO_LO, fw_input);
@@ -188,9 +185,6 @@
if ((sc->sc_flags & FWF_ATTACHED) == 0)
return 0;
-#if NBPFILTER > 0
- bpfdetach(ifp);
-#endif
ieee1394_ifdetach(ifp);
if_detach(ifp);
if (sc->sc_flags & FWF_ENABLED) {
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/pci/if_lmcvar.h
--- a/sys/dev/pci/if_lmcvar.h Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/pci/if_lmcvar.h Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmcvar.h,v 1.4 2000/09/06 18:56:45 thorpej Exp $ */
+/* $NetBSD: if_lmcvar.h,v 1.5 2000/12/12 18:00:25 thorpej Exp $ */
/*-
* Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -578,7 +578,7 @@
#if !defined(LMC_BPF_MTAP) && NBPFILTER > 0
#define LMC_BPF_MTAP(sc, m) bpf_mtap((sc)->lmc_bpf, m)
#define LMC_BPF_TAP(sc, p, l) bpf_tap((sc)->lmc_bpf, p, l)
-#define LMC_BPF_ATTACH(sc) bpfattach(&(sc)->lmc_bpf, &(sc)->lmc_sppp.pp_if, DLT_PPP_SERIAL, PPP_HEADER_LEN)
+#define LMC_BPF_ATTACH(sc) bpfattach(&(sc)->lmc_sppp.pp_if, DLT_PPP_SERIAL, PPP_HEADER_LEN)
#endif
/*
diff -r 3eb770757457 -r 6ab39ae33403 sys/dev/usb/if_upl.c
--- a/sys/dev/usb/if_upl.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/dev/usb/if_upl.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.10 2000/12/08 02:24:07 augustss Exp $ */
+/* $NetBSD: if_upl.c,v 1.11 2000/12/12 18:00:25 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -318,7 +318,7 @@
if_attach(ifp);
#if NBPFILTER > 0
- bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, 0);
+ bpfattach(ifp, DLT_EN10MB, 0);
#endif
#if NRND > 0
rnd_attach_source(&sc->sc_rnd_source, USBDEVNAME(sc->sc_dev),
diff -r 3eb770757457 -r 6ab39ae33403 sys/net/if_arcsubr.c
--- a/sys/net/if_arcsubr.c Tue Dec 12 17:56:21 2000 +0000
+++ b/sys/net/if_arcsubr.c Tue Dec 12 18:00:22 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.31 2000/04/12 10:36:38 itojun Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.32 2000/12/12 18:00:25 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -39,6 +39,8 @@
*/
#include "opt_inet.h"
+#include "bpfilter.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -61,6 +63,10 @@
#include <net/if_arp.h>
#include <net/if_ether.h>
Home |
Main Index |
Thread Index |
Old Index