D19757.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19757.diff
View Options

	Index: head/sys/net/if_bridge.c
	===================================================================
	--- head/sys/net/if_bridge.c
	+++ head/sys/net/if_bridge.c
	@@ -2000,7 +2000,7 @@
	struct rtentry *rt)
	{
	struct ether_header *eh;
	- struct ifnet *dst_if;
	+ struct ifnet bifp, dst_if;
	struct bridge_softc *sc;
	uint16_t vlan;

	@@ -2015,13 +2015,14 @@
	vlan = VLANTAGOF(m);

	BRIDGE_LOCK(sc);
	+ bifp = sc->sc_ifp;

	/*
	* If bridge is down, but the original output interface is up,
	* go ahead and send out that interface. Otherwise, the packet
	* is dropped below.
	*/
	- if ((sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
	+ if ((bifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
	dst_if = ifp;
	goto sendunicast;
	}
	@@ -2034,6 +2035,9 @@
	dst_if = NULL;
	else
	dst_if = bridge_rtlookup(sc, eh->ether_dhost, vlan);
	+ /* Tap any traffic not passing back out the originating interface */
	+ if (dst_if != ifp)
	+ ETHER_BPF_MTAP(bifp, m);
	if (dst_if == NULL) {
	struct bridge_iflist *bif;
	struct mbuf *mc;
	@@ -2071,7 +2075,7 @@
	} else {
	mc = m_copypacket(m, M_NOWAIT);
	if (mc == NULL) {
	- if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
	+ if_inc_counter(bifp, IFCOUNTER_OERRORS, 1);
	continue;
	}
	}
	@@ -2450,6 +2454,8 @@
	return (NULL); \
	} \
	} \
	+ if ((iface) != bifp) \
	+ ETHER_BPF_MTAP(iface, m); \
	BRIDGE_UNLOCK(sc); \
	return (m); \
	} \