svn commit: r345193 - head/sys/net

Kyle Evans kevans at FreeBSD.org
Fri Mar 15 17:18:20 UTC 2019


Author: kevans
Date: Fri Mar 15 17:18:19 2019
New Revision: 345193
URL: https://svnweb.freebsd.org/changeset/base/345193

Log:
  Revert r345192: Too many trees in play for bridge(4) bits
  
  An accidental appendage was committed that has not undergone review yet.

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Fri Mar 15 17:13:05 2019	(r345192)
+++ head/sys/net/if_bridge.c	Fri Mar 15 17:18:19 2019	(r345193)
@@ -2449,22 +2449,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 		}							\
 		m->m_pkthdr.rcvif = iface;				\
 		BRIDGE_UNLOCK(sc);					\
-		/*							\
-		 * These mbufs will not have another chance to get sent	\
-		 * to bpf elsewhere in the stack as being received	\
-		 * by this interface, because they are coming in over	\
-		 * the bridge.  They likely have been accounted for	\
-		 * when received by the interface that they came from,	\
-		 * but this is not enough for other consumers,		\
-		 * e.g. dhclient, to be satisfied.			\
-		 *							\
-		 * rcvif needs to be set on the mbuf here, lest we risk	\
-		 * losing the mbuf as a "duplicate" because it's	\
-		 * considered outgoing by bpf.				\
-		 */							\
-		if ((iface)->if_type != IFT_BRIDGE &&			\
-		    (iface)->if_bpf != NULL && (iface) != (ifp))	 \
-			ETHER_BPF_MTAP(iface, m);			\
 		return (m);						\
 	}								\
 									\
@@ -2906,6 +2890,7 @@ bridge_rtable_fini(struct bridge_softc *sc)
 
 	KASSERT(sc->sc_brtcnt == 0,
 	    ("%s: %d bridge routes referenced", __func__, sc->sc_brtcnt));
+	bridge_rtflush(sc, 1);
 	free(sc->sc_rthash, M_DEVBUF);
 }
 


More information about the svn-src-all mailing list