diff options
author | jhb <jhb@FreeBSD.org> | 2006-12-29 13:59:50 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-12-29 13:59:50 +0000 |
commit | 67155fb0b2a1b3d5ee6f59198ae389f826754c66 (patch) | |
tree | 5677cbe8565b075c609dc8ea0a6087d8251a7bca /sys/contrib | |
parent | 89e0ae76db000800f893d800de9dcbf15519ff50 (diff) | |
download | FreeBSD-src-67155fb0b2a1b3d5ee6f59198ae389f826754c66.zip FreeBSD-src-67155fb0b2a1b3d5ee6f59198ae389f826754c66.tar.gz |
Various bpf(4) related fixes to catch places up to the new bpf(4)
semantics.
- Stop testing bpf pointers for NULL. In some cases use
bpf_peers_present() and then call the function directly inside the
conditional block instead of the macro.
- For places where the entire conditional block is the macro, remove the
test and make the macro unconditional.
- Use BPF_MTAP() in if_pfsync on FreeBSD instead of an expanded version of
the old semantics.
Reviewed by: csjp (older version)
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/pf/net/if_pfsync.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c index bec33e4..24687de 100644 --- a/sys/contrib/pf/net/if_pfsync.c +++ b/sys/contrib/pf/net/if_pfsync.c @@ -1793,9 +1793,13 @@ pfsync_sendout(sc) KASSERT(m != NULL, ("pfsync_sendout: null mbuf")); #endif #if NBPFILTER > 0 +#ifdef __FreeBSD__ + BPF_MTAP(ifp, m); +#else if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m); #endif +#endif if (sc->sc_mbuf_net) { m_freem(m); |