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

When considering an ethernet frame that is not destined for us, do not

Browse Source 
only allow this to be further processed when bridging is active on
that interface, but also if the current packet has a VLAN tag and
VLANs are active on our interface.  This gives the VLAN layers a
chance to also consider the packet (and perhaps drop it instead of the
main dispatcher).

This fixes a situation where bridging was only active on VLAN
interfaces but ether_demux() called on behalf of the main interface
had already thrown the packet away.

MFC after:	4 weeks
This commit is contained in:
Joerg Wunsch 2004-06-24 12:31:44 +00:00
parent d7647d966e
commit cd0cd0149b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/if_ethersubr.c
View File

@ -639,18 +639,26 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
KASSERT(ifp != NULL, ("ether_demux: NULL interface pointer"));
eh = mtod(m, struct ether_header *);
ether_type = ntohs(eh->ether_type);
#if defined(INET) || defined(INET6)
if (rule) /* packet was already bridged */
goto post_stats;
#endif
if (!(BDG_ACTIVE(ifp))) {
if (!(BDG_ACTIVE(ifp)) &&
!(ether_type == ETHERTYPE_VLAN && ifp->if_nvlans > 0)) {
/*
* Discard packet if upper layers shouldn't see it because it
* was unicast to a different Ethernet address. If the driver
* is working properly, then this situation can only happen
* when the interface is in promiscuous mode.
*
* If VLANs are active, and this packet has a VLAN tag, do
* not drop it here but pass it on to the VLAN layer, to
* give them a chance to consider it as well (e. g. in case
* bridging is only active on a VLAN). They will drop it if
* it's undesired.
*/
if ((ifp->if_flags & IFF_PROMISC) != 0
&& (eh->ether_dhost[0] & 1) == 0
@ -704,8 +712,6 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
return;
}
ether_type = ntohs(eh->ether_type);
/*
* Handle protocols that expect to have the Ethernet header
* (and possibly FCS) intact.