diff options
| author | wpaul <wpaul@FreeBSD.org> | 1999-09-23 03:32:57 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1999-09-23 03:32:57 +0000 |
| commit | 165d81879ead70b028b140d76d9143aefee5ce16 (patch) | |
| tree | 6bbbef5ef1ef94b97c53f10e98f93f50d12e1be5 /sys/dev/sf | |
| parent | 9e89242d36c564123e515222eb0c9174c38c469c (diff) | |
| download | FreeBSD-src-165d81879ead70b028b140d76d9143aefee5ce16.zip FreeBSD-src-165d81879ead70b028b140d76d9143aefee5ce16.tar.gz | |
As suggested by phk, unconditionalize BPF support in these drivers. Since
there are stubs compiled into the kernel if BPF support is not enabled,
there aren't any problems with unresolved symbols. The modules in /modules
are compiled with BPF support enabled anyway, so the most this will do is
bloat GENERIC a little.
Diffstat (limited to 'sys/dev/sf')
| -rw-r--r-- | sys/dev/sf/if_sf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 5f02606..f9e9d3a 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -78,8 +78,6 @@ * registers inside the 256-byte I/O window. */ -#include "bpf.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> @@ -94,9 +92,7 @@ #include <net/if_dl.h> #include <net/if_media.h> -#if NBPF > 0 #include <net/bpf.h> -#endif #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ @@ -815,9 +811,7 @@ static int sf_attach(dev) if_attach(ifp); ether_ifattach(ifp); -#if NBPF > 0 bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); -#endif fail: splx(s); @@ -1002,7 +996,6 @@ static void sf_rxeof(sc) eh = mtod(m, struct ether_header *); ifp->if_ipackets++; -#if NBPF > 0 if (ifp->if_bpf) { bpf_mtap(ifp, m); if (ifp->if_flags & IFF_PROMISC && @@ -1012,7 +1005,6 @@ static void sf_rxeof(sc) continue; } } -#endif /* Remove header from mbuf and pass it on. */ m_adj(m, sizeof(struct ether_header)); @@ -1333,10 +1325,9 @@ static void sf_start(ifp) * If there's a BPF listener, bounce a copy of this frame * to him. */ -#if NBPF > 0 if (ifp->if_bpf) bpf_mtap(ifp, m_head); -#endif + SF_INC(i, SF_TX_DLIST_CNT); sc->sf_tx_cnt++; if (sc->sf_tx_cnt == (SF_TX_DLIST_CNT - 2)) |
