diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2004-09-17 10:14:49 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2004-09-17 10:14:49 +0000 |
| commit | 6fcc17644df67a6ac5260b5422106cdf20d782cb (patch) | |
| tree | 151f4bdbe2daac1b37ff7e87a2f76fc269ccdd44 /sys/dev/ed | |
| parent | 9c55cc61b38d4a22130961cd5037818dd801c99e (diff) | |
Notes
Diffstat (limited to 'sys/dev/ed')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index bccc4b974377..d0df87579b78 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #endif #include <net/bpf.h> -#include <net/bridge.h> #include <machine/md_var.h> @@ -2810,26 +2809,9 @@ ed_get_packet(sc, buf, len) eh = mtod(m, struct ether_header *); /* - * Don't read in the entire packet if we know we're going to drop it - * and no bpf is active. + * Get packet, including link layer address, from interface. */ - if (!ifp->if_bpf && BDG_ACTIVE( (ifp) ) ) { - struct ifnet *bif; - - ed_ring_copy(sc, buf, (char *)eh, ETHER_HDR_LEN); - bif = bridge_in_ptr(ifp, eh) ; - if (bif == BDG_DROP) { - m_freem(m); - return; - } - if (len > ETHER_HDR_LEN) - ed_ring_copy(sc, buf + ETHER_HDR_LEN, - (char *)(eh + 1), len - ETHER_HDR_LEN); - } else - /* - * Get packet, including link layer address, from interface. - */ - ed_ring_copy(sc, buf, (char *)eh, len); + ed_ring_copy(sc, buf, (char *)eh, len); m->m_pkthdr.len = m->m_len = len; |
