diff options
| author | luigi <luigi@FreeBSD.org> | 2001-11-04 22:56:25 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2001-11-04 22:56:25 +0000 |
| commit | f565e0a1dff9f306dcf2a7ce69991a22170dfa34 (patch) | |
| tree | c941161cecb4fb744bf3988da945ddfd0a75a240 /sys/dev/ed | |
| parent | 473a686e79edeaa4c5a1b0e1fced3d7dcc9ef444 (diff) | |
| download | FreeBSD-src-f565e0a1dff9f306dcf2a7ce69991a22170dfa34.zip FreeBSD-src-f565e0a1dff9f306dcf2a7ce69991a22170dfa34.tar.gz | |
MFS: sync the ipfw/dummynet/bridge code with the one recently merged
into stable (mostly , but not only, formatting and comments changes).
Diffstat (limited to 'sys/dev/ed')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 3d9714c..43099ef 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -66,7 +66,6 @@ #endif #include <net/bpf.h> -#include "opt_bdg.h" #include <net/bridge.h> #include <machine/md_var.h> @@ -2710,8 +2709,7 @@ ed_get_packet(sc, buf, len) * Don't read in the entire packet if we know we're going to drop it * and no bpf is active. */ - if (!sc->arpcom.ac_if.if_bpf && do_bridge && bdg_forward_ptr != NULL && - BDG_USED( (&sc->arpcom.ac_if) ) ) { + if (!sc->arpcom.ac_if.if_bpf && BDG_ACTIVE( (&sc->arpcom.ac_if) ) ) { struct ifnet *bif; ed_ring_copy(sc, buf, (char *)eh, ETHER_HDR_LEN); |
