d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove layer intermixing. Device driver should pass the frame should

Browse Source 
pass frame to ether_input(), and do not play with bridge itself.

Reviewed by:	sam, andre
Approved by:	julian (mentor)
MFC after:	1 week
This commit is contained in:
glebius 2004-09-06 21:14:32 +00:00
parent ba7370a4c3
commit dd09be3e02
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/ed/if_ed.c
View File

@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#endif #endif
#include <net/bpf.h> #include <net/bpf.h>
#include <net/bridge.h>
#include <machine/md_var.h> #include <machine/md_var.h>
@ -2810,26 +2809,9 @@ ed_get_packet(sc, buf, len)
eh = mtod(m, struct ether_header *); eh = mtod(m, struct ether_header *);
/* /*
* Don't read in the entire packet if we know we're going to drop it * Get packet, including link layer address, from interface.
* and no bpf is active.
*/ */
if (!ifp->if_bpf && BDG_ACTIVE( (ifp) ) ) { ed_ring_copy(sc, buf, (char *)eh, len);
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);
m->m_pkthdr.len = m->m_len = len; m->m_pkthdr.len = m->m_len = len;