Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Redefine bpf linkage through an always present op vector...
details: https://anonhg.NetBSD.org/src/rev/55c1d44db915
branches: trunk
changeset: 750944:55c1d44db915
user: pooka <pooka%NetBSD.org@localhost>
date: Tue Jan 19 22:06:18 2010 +0000
description:
Redefine bpf linkage through an always present op vector, i.e.
#if NBPFILTER is no longer required in the client. This change
doesn't yet add support for loading bpf as a module, since drivers
can register before bpf is attached. However, callers of bpf can
now be modularized.
Dynamically loadable bpf could probably be done fairly easily with
coordination from the stub driver and the real driver by registering
attachments in the stub before the real driver is loaded and doing
a handoff. ... and I'm not going to ponder the depths of unload
here.
Tested with i386/MONOLITHIC, modified MONOLITHIC without bpf and rump.
diffstat:
sys/arch/acorn32/podulebus/if_ie.c | 15 ++-----
sys/arch/alpha/a12/if_xb.c | 10 ++---
sys/arch/amiga/dev/if_ed.c | 15 ++-----
sys/arch/amiga/dev/if_es.c | 15 ++-----
sys/arch/amiga/dev/if_le.c | 5 +-
sys/arch/amiga/dev/if_qn.c | 15 ++-----
sys/arch/arc/jazz/if_sn_jazzio.c | 6 +--
sys/arch/arm/at91/at91emac.c | 17 ++------
sys/arch/arm/ep93xx/epe.c | 15 ++-----
sys/arch/arm/gemini/gemini_gmac.c | 12 ++----
sys/arch/arm/gemini/if_gpn.c | 15 ++-----
sys/arch/arm/xscale/ixp425_if_npe.c | 15 ++-----
sys/arch/atari/vme/if_le_vme.c | 5 +-
sys/arch/evbppc/virtex/dev/if_temac.c | 11 +----
sys/arch/ews4800mips/sbd/if_le_sbdio.c | 5 +-
sys/arch/hp300/dev/if_le.c | 5 +-
sys/arch/hp700/gsc/if_iee_gsc.c | 9 +---
sys/arch/i386/conf/GENERIC | 6 +-
sys/arch/luna68k/dev/if_le.c | 5 +-
sys/arch/mac68k/dev/if_ae.c | 5 +-
sys/arch/mac68k/dev/if_mc.c | 15 ++-----
sys/arch/mac68k/nubus/if_netdock_nubus.c | 15 ++-----
sys/arch/macppc/dev/am79c950.c | 15 ++-----
sys/arch/macppc/dev/if_bm.c | 15 ++-----
sys/arch/macppc/dev/if_gm.c | 15 ++-----
sys/arch/mips/adm5120/dev/if_admsw.c | 15 ++-----
sys/arch/mips/adm5120/dev/if_admswvar.h | 10 +----
sys/arch/mips/alchemy/dev/if_aumac.c | 15 ++-----
sys/arch/mips/atheros/dev/if_ae.c | 15 ++-----
sys/arch/mips/sibyte/dev/sbmac.c | 17 ++------
sys/arch/mipsco/obio/if_le.c | 5 +-
sys/arch/mvme68k/dev/if_le.c | 5 +-
sys/arch/news68k/dev/if_le.c | 5 +-
sys/arch/newsmips/apbus/if_sn.c | 15 ++-----
sys/arch/newsmips/dev/if_le.c | 5 +-
sys/arch/next68k/dev/if_xe.c | 5 +-
sys/arch/next68k/dev/mb8795.c | 15 ++-----
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 15 ++-----
sys/arch/sgimips/hpc/if_sq.c | 15 ++-----
sys/arch/sgimips/ioc/if_le_oioc.c | 5 +-
sys/arch/sgimips/mace/if_mec.c | 15 ++-----
sys/arch/sun2/dev/if_ec.c | 15 ++-----
sys/arch/sun3/dev/if_ie.c | 27 ++-----------
sys/arch/sun3/dev/if_le.c | 5 +-
sys/arch/vax/if/if_le.c | 5 +-
sys/arch/vax/if/if_le_vsbus.c | 5 +-
sys/arch/vax/if/if_ze.c | 9 +---
sys/arch/x68k/dev/if_ne_intio.c | 5 +-
sys/arch/x68k/dev/if_ne_neptune.c | 10 +----
sys/arch/xen/xen/if_xennet_xenbus.c | 15 ++-----
sys/arch/xen/xen/xennetback_xenbus.c | 17 ++------
sys/conf/files | 5 +-
sys/dev/bi/if_ni.c | 15 ++-----
sys/dev/dec/if_le_dec.c | 5 +-
sys/dev/eisa/depca_eisa.c | 5 +-
sys/dev/ic/aic6915.c | 15 ++-----
sys/dev/ic/am7990.c | 13 +-----
sys/dev/ic/am79900.c | 13 +-----
sys/dev/ic/an.c | 27 +++----------
sys/dev/ic/ath.c | 45 ++++++----------------
sys/dev/ic/atw.c | 31 +++++----------
sys/dev/ic/awi.c | 15 ++-----
sys/dev/ic/bwi.c | 35 +++++------------
sys/dev/ic/bwivar.h | 4 +-
sys/dev/ic/cs89x0.c | 15 ++-----
sys/dev/ic/dp8390.c | 15 ++-----
sys/dev/ic/dp83932.c | 15 ++-----
sys/dev/ic/elink3.c | 15 ++-----
sys/dev/ic/elinkxl.c | 16 ++-----
sys/dev/ic/gem.c | 15 ++-----
sys/dev/ic/hd64570.c | 19 ++-------
sys/dev/ic/hd64570var.h | 4 +-
sys/dev/ic/hme.c | 15 ++-----
sys/dev/ic/i82557.c | 15 ++-----
sys/dev/ic/i82586.c | 15 ++-----
sys/dev/ic/i82596.c | 15 ++-----
sys/dev/ic/lan9118.c | 15 ++-----
sys/dev/ic/lance.c | 11 +----
sys/dev/ic/lemac.c | 15 ++-----
sys/dev/ic/mb86950.c | 15 ++-----
sys/dev/ic/mb86960.c | 15 ++-----
sys/dev/ic/midway.c | 15 +------
sys/dev/ic/mtd803.c | 15 ++-----
sys/dev/ic/pdq_ifsubr.c | 13 +-----
sys/dev/ic/pdqvar.h | 6 +-
sys/dev/ic/rrunner.c | 15 ++-----
sys/dev/ic/rt2560.c | 50 +++++++------------------
sys/dev/ic/rt2560var.h | 4 +-
sys/dev/ic/rt2661.c | 44 ++++++----------------
sys/dev/ic/rt2661var.h | 4 +-
sys/dev/ic/rtl8169.c | 15 ++-----
sys/dev/ic/rtl81x9.c | 15 ++-----
sys/dev/ic/rtw.c | 31 +++++----------
sys/dev/ic/seeq8005.c | 15 ++-----
sys/dev/ic/sgec.c | 15 ++-----
sys/dev/ic/smc83c170.c | 15 ++-----
sys/dev/ic/smc90cx6.c | 15 ++-----
sys/dev/ic/smc91cxx.c | 15 ++-----
sys/dev/ic/tropic.c | 19 ++-------
sys/dev/ic/tulip.c | 17 ++------
sys/dev/ic/wi.c | 28 ++++----------
sys/dev/if_ndis/if_ndis.c | 8 ++-
sys/dev/isa/depca_isa.c | 5 +-
sys/dev/isa/if_eg.c | 15 ++-----
sys/dev/isa/if_el.c | 15 ++-----
sys/dev/isa/if_iy.c | 15 ++-----
sys/dev/marvell/if_gfe.c | 20 +++-------
sys/dev/ofw/ofnet.c | 15 ++-----
sys/dev/pci/if_age.c | 15 ++-----
sys/dev/pci/if_ale.c | 15 ++-----
sys/dev/pci/if_bce.c | 15 ++-----
sys/dev/pci/if_bge.c | 17 ++------
sys/dev/pci/if_bnx.c | 12 ++----
sys/dev/pci/if_bnxreg.h | 5 +--
sys/dev/pci/if_bwi_pci.c | 5 +-
sys/dev/pci/if_cas.c | 19 ++-------
sys/dev/pci/if_de.c | 11 +----
sys/dev/pci/if_devar.h | 8 ++--
sys/dev/pci/if_dge.c | 15 ++-----
sys/dev/pci/if_fpa.c | 7 +--
sys/dev/pci/if_gem_pci.c | 6 +--
sys/dev/pci/if_ipw.c | 33 ++++------------
sys/dev/pci/if_ipwvar.h | 4 +-
sys/dev/pci/if_iwi.c | 29 ++++----------
sys/dev/pci/if_iwivar.h | 4 +-
sys/dev/pci/if_iwn.c | 42 +++++++--------------
sys/dev/pci/if_iwnvar.h | 4 +-
sys/dev/pci/if_jme.c | 15 ++-----
sys/dev/pci/if_kse.c | 15 ++-----
sys/dev/pci/if_lii.c | 15 ++-----
sys/dev/pci/if_lmc.c | 9 +---
sys/dev/pci/if_lmc.h | 16 ++------
sys/dev/pci/if_msk.c | 15 ++-----
sys/dev/pci/if_nfe.c | 15 ++-----
sys/dev/pci/if_pcn.c | 15 ++-----
sys/dev/pci/if_ral_pci.c | 5 +-
sys/dev/pci/if_sip.c | 21 +++-------
sys/dev/pci/if_sk.c | 17 ++------
sys/dev/pci/if_ste.c | 15 ++-----
sys/dev/pci/if_stge.c | 15 ++-----
sys/dev/pci/if_ti.c | 17 ++------
sys/dev/pci/if_tl.c | 15 ++-----
sys/dev/pci/if_txp.c | 15 ++-----
sys/dev/pci/if_vge.c | 13 ++----
sys/dev/pci/if_vr.c | 15 ++-----
sys/dev/pci/if_wm.c | 17 ++------
sys/dev/pci/if_wpi.c | 39 +++++--------------
sys/dev/pci/if_wpivar.h | 4 +-
sys/dev/pci/if_xge.c | 15 ++-----
sys/dev/pcmcia/if_cnw.c | 15 ++-----
sys/dev/pcmcia/if_ray.c | 15 ++-----
sys/dev/pcmcia/if_xi.c | 15 ++-----
sys/dev/pcmcia/mhzc.c | 7 +--
sys/dev/pcmcia/xirc.c | 7 +--
sys/dev/ppbus/if_plip.c | 19 ++-------
sys/dev/qbus/if_de.c | 15 ++-----
sys/dev/qbus/if_qe.c | 15 ++-----
sys/dev/qbus/if_qt.c | 15 ++-----
sys/dev/sbus/be.c | 15 ++-----
sys/dev/sbus/if_le.c | 5 +-
sys/dev/sbus/if_le_lebuffer.c | 5 +-
sys/dev/sbus/if_le_ledma.c | 5 +-
sys/dev/sbus/qe.c | 15 ++-----
sys/dev/scsipi/if_se.c | 17 ++------
sys/dev/usb/if_atu.c | 15 ++-----
sys/dev/usb/if_aue.c | 17 ++------
sys/dev/usb/if_axe.c | 18 ++-------
sys/dev/usb/if_cdce.c | 17 ++------
sys/dev/usb/if_cue.c | 19 ++-------
sys/dev/usb/if_kue.c | 15 ++-----
sys/dev/usb/if_rum.c | 46 ++++++-----------------
sys/dev/usb/if_rumvar.h | 4 +-
sys/dev/usb/if_udav.c | 16 ++------
sys/dev/usb/if_upl.c | 25 +++---------
sys/dev/usb/if_ural.c | 39 +++++--------------
sys/dev/usb/if_uralvar.h | 4 +-
sys/dev/usb/if_url.c | 16 ++------
sys/dev/usb/if_zyd.c | 41 +++++---------------
sys/dev/usb/if_zydreg.h | 4 +-
sys/dist/ipf/netinet/ip_compat.h | 8 +++-
sys/dist/pf/net/if_pflog.c | 17 ++------
sys/dist/pf/net/if_pfsync.c | 26 +++---------
sys/dist/pf/net/pf.c | 7 +--
sys/kern/init_main.c | 11 ++++-
sys/net/bpf.c | 62 ++++++++++++++++++-------------
sys/net/bpf.h | 32 +++++++++------
sys/net/bpf_stub.c | 56 ++++++++++++++++++++++++++++
sys/net/if_arcsubr.c | 11 +----
sys/net/if_atmsubr.c | 12 ++----
sys/net/if_bridge.c | 7 +--
sys/net/if_ecosubr.c | 11 +----
sys/net/if_etherip.c | 11 +----
sys/net/if_ethersubr.c | 16 ++-----
sys/net/if_faith.c | 17 ++------
sys/net/if_fddisubr.c | 17 ++------
sys/net/if_gif.c | 22 +++-------
sys/net/if_gre.c | 24 +++--------
sys/net/if_hippisubr.c | 12 ++----
sys/net/if_ieee1394subr.c | 25 +++---------
sys/net/if_loop.c | 19 ++-------
sys/net/if_ppp.c | 25 +++---------
sys/net/if_pppoe.c | 24 +++--------
sys/net/if_sl.c | 33 +++-------------
sys/net/if_srt.c | 16 +++----
sys/net/if_stf.c | 24 +++--------
sys/net/if_strip.c | 33 +++-------------
sys/net/if_tap.c | 24 +++--------
sys/net/if_tokensubr.c | 17 ++------
sys/net/if_tun.c | 23 +++--------
sys/net/if_vlan.c | 15 ++-----
sys/net/ppp_tty.c | 15 ++-----
211 files changed, 986 insertions(+), 2274 deletions(-)
diffs (truncated from 12279 to 300 lines):
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.27 2009/05/16 16:40:58 cegger Exp $ */
+/* $NetBSD: if_ie.c,v 1.28 2010/01/19 22:06:18 pooka Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.27 2009/05/16 16:40:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.28 2010/01/19 22:06:18 pooka Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -106,11 +106,8 @@
/* BPF support */
-#include "bpfilter.h"
-#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#endif
/* Some useful defines and macros */
@@ -1287,11 +1284,9 @@
ifp->if_ipackets++;
-#if NBPFILTER > 0
if ( ifp->if_bpf ) {
- bpf_mtap(ifp->if_bpf, m );
+ bpf_ops->bpf_mtap(ifp->if_bpf, m);
};
-#endif
(*ifp->if_input)(ifp, m);
}
@@ -1498,10 +1493,8 @@
len += m->m_len;
}
-#if NBPFILTER > 0
if ( ifp->if_bpf )
- bpf_mtap(ifp->if_bpf, m0);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, m0);
m_freem(m0);
if (len < ETHER_MIN_LEN - ETHER_CRC_LEN) {
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/alpha/a12/if_xb.c
--- a/sys/arch/alpha/a12/if_xb.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/alpha/a12/if_xb.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.c,v 1.24 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: if_xb.c,v 1.25 2010/01/19 22:06:18 pooka 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.24 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.25 2010/01/19 22:06:18 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@
xbfound = 1;
ccp = &xb_configuration;
xb_init_config(ccp, 1);
- printf(": driver %s mtu %lu\n", "$Revision: 1.24 $", xbi.if_mtu);
+ printf(": driver %s mtu %lu\n", "$Revision: 1.25 $", xbi.if_mtu);
}
static void
@@ -746,7 +746,5 @@
if_attach(&xbi);
if_alloc_sadl(&xbi);
-#if NBPFILTER > 0
- bpfattach(&xbi, DLT_NULL, 0);
-#endif
+ bpf_ops->bpf_attach(&xbi, DLT_NULL, 0, &xbi.if_bpf);
}
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/amiga/dev/if_ed.c
--- a/sys/arch/amiga/dev/if_ed.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/amiga/dev/if_ed.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ed.c,v 1.60 2009/10/26 19:16:54 cegger Exp $ */
+/* $NetBSD: if_ed.c,v 1.61 2010/01/19 22:06:19 pooka Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -19,9 +19,8 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ed.c,v 1.60 2009/10/26 19:16:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ed.c,v 1.61 2010/01/19 22:06:19 pooka Exp $");
-#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,10 +49,8 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#endif
#include <machine/cpu.h>
@@ -549,11 +546,9 @@
if (sc->xmit_busy == 0)
ed_xmit(sc);
-#if NBPFILTER > 0
/* Tap off here if there is a BPF listener. */
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m0);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, m0);
m_freem(m0);
@@ -997,14 +992,12 @@
return;
}
-#if NBPFILTER > 0
/*
* Check if there's a BPF listener on this interface. If so, hand off
* the raw packet to bpf.
*/
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, m);
(*ifp->if_input)(ifp, m);
}
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/amiga/dev/if_es.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.48 2009/10/26 19:16:54 cegger Exp $ */
+/* $NetBSD: if_es.c,v 1.49 2010/01/19 22:06:19 pooka Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -33,9 +33,8 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.48 2009/10/26 19:16:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.49 2010/01/19 22:06:19 pooka Exp $");
-#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,10 +97,8 @@
#endif
};
-#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#endif
#ifdef ESDEBUG
/* console error messages */
@@ -722,14 +719,12 @@
while (smc->b2.mmucr & MMUCR_BUSY)
;
#endif
-#if NBPFILTER > 0
/*
* Check if there's a BPF listener on this interface. If so, hand off
* the raw packet to bpf.
*/
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, top);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, top);
(*ifp->if_input)(ifp, top);
#ifdef ESDEBUG
if (--sc->sc_smcbusy) {
@@ -931,10 +926,8 @@
if (smc->b2.pnr != active_pnr)
printf("%s: esstart - PNR changed %x->%x\n",
sc->sc_dev.dv_xname, active_pnr, smc->b2.pnr);
-#if NBPFILTER > 0
if (sc->sc_ethercom.ec_if.if_bpf)
- bpf_mtap(sc->sc_ethercom.ec_if.if_bpf, m0);
-#endif
+ bpf_ops->bpf_mtap(sc->sc_ethercom.ec_if.if_bpf, m0);
m_freem(m0);
sc->sc_ethercom.ec_if.if_opackets++; /* move to interrupt? */
sc->sc_intctl |= MSK_TX_EMPTY | MSK_TX;
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/amiga/dev/if_le.c
--- a/sys/arch/amiga/dev/if_le.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/amiga/dev/if_le.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.44 2009/05/19 18:39:26 phx Exp $ */
+/* $NetBSD: if_le.c,v 1.45 2010/01/19 22:06:19 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -74,9 +74,8 @@
#include "opt_inet.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.44 2009/05/19 18:39:26 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.45 2010/01/19 22:06:19 pooka Exp $");
-#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/amiga/dev/if_qn.c Tue Jan 19 22:06:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.36 2010/01/18 18:14:43 pooka Exp $ */
+/* $NetBSD: if_qn.c,v 1.37 2010/01/19 22:06:19 pooka Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.36 2010/01/18 18:14:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.37 2010/01/19 22:06:19 pooka Exp $");
#include "qn.h"
#if NQN > 0
@@ -75,7 +75,6 @@
#define QN_DEBUG1_no /* hides some old tests */
#define QN_CHECKS_no /* adds some checks (not needed in normal situations) */
-#include "bpfilter.h"
/*
* Fujitsu MB86950 Ethernet Controller (as used in the QuickNet QN2000
@@ -149,10 +148,8 @@
u_char transmit_pending;
} qn_softc[NQN];
-#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#endif
int qnmatch(struct device *, struct cfdata *, void *);
@@ -402,7 +399,6 @@
if (m == 0)
return;
-#if NBPFILTER > 0
/*
* If bpf is listening on this interface, let it
* see the packet before we commit it to the wire
@@ -412,8 +408,7 @@
*
*/
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, m);
len = qn_put(sc->nic_fifo, m);
m_freem(m);
@@ -594,10 +589,8 @@
len -= len1;
}
-#if NBPFILTER > 0
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, head);
-#endif
+ bpf_ops->bpf_mtap(ifp->if_bpf, head);
(*ifp->if_input)(ifp, head);
return;
diff -r 76214ff9e67d -r 55c1d44db915 sys/arch/arc/jazz/if_sn_jazzio.c
--- a/sys/arch/arc/jazz/if_sn_jazzio.c Tue Jan 19 21:54:53 2010 +0000
+++ b/sys/arch/arc/jazz/if_sn_jazzio.c Tue Jan 19 22:06:18 2010 +0000
Home |
Main Index |
Thread Index |
Old Index