diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index d67ebef..9dfdbc6 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -579,7 +579,7 @@ bstp_acknowledge_topology_change(struct bridge_softc *sc,
 	bstp_transmit_config(sc, bif);
 }
 
-struct mbuf *
+void
 bstp_input(struct bridge_softc *sc, struct bridge_iflist *bif, struct mbuf *m)
 {
 	struct ether_header *eh;
@@ -592,7 +592,7 @@ bstp_input(struct bridge_softc *sc, struct bridge_iflist *bif, struct mbuf *m)
 	eh = mtod(m, struct ether_header *);
 
 	if ((bif->bif_flags & IFBIF_STP) == 0)
-		return (m);
+		goto out;
 
 	len = ntohs(eh->ether_type);
 	if (len < sizeof(tpdu))
@@ -664,7 +664,7 @@ bstp_input(struct bridge_softc *sc, struct bridge_iflist *bif, struct mbuf *m)
  out:
 	if (m)
 		m_freem(m);
-	return (NULL);
+	return;
 }
 
 void
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 72a5aff..7bc6f80 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -188,6 +188,7 @@ static int	bridge_init(struct ifnet *);
 static void	bridge_stop(struct ifnet *, int);
 static void	bridge_start(struct ifnet *);
 
+static void	bridge_input(struct ifnet *, struct mbuf *);
 static void	bridge_forward(void *);
 
 static void	bridge_timer(void *);
@@ -707,6 +708,7 @@ bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif)
 		break;
 	}
 
+	ifs->if_input = ether_input;
 	ifs->if_bridge = NULL;
 	LIST_REMOVE(bif, bif_next);
 
@@ -739,6 +741,9 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg)
 	if (ifs->if_bridge != NULL)
 		return (EBUSY);
 
+	if (ifs->if_input != ether_input)
+		return EINVAL;
+
 	bif = malloc(sizeof(*bif), M_DEVBUF, M_NOWAIT);
 	if (bif == NULL)
 		return (ENOMEM);
@@ -764,6 +769,7 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg)
 
 	ifs->if_bridge = sc;
 	LIST_INSERT_HEAD(&sc->sc_iflist, bif, bif_next);
+	ifs->if_input = bridge_input;
 
 	if (sc->sc_if.if_flags & IFF_RUNNING)
 		bstp_initialization(sc);
@@ -1570,114 +1576,106 @@ bridge_forward(void *v)
  *	bridging if it is not for us.
  *	should be called at splnet()
  */
-struct mbuf *
+static void
 bridge_input(struct ifnet *ifp, struct mbuf *m)
 {
 	struct bridge_softc *sc = ifp->if_bridge;
 	struct bridge_iflist *bif;
 	struct ether_header *eh;
-	struct mbuf *mc;
 
-	if ((sc->sc_if.if_flags & IFF_RUNNING) == 0)
-		return (m);
+	if ((sc->sc_if.if_flags & IFF_RUNNING) == 0) {
+		ether_input(ifp, m);
+		return;
+	}
 
 	bif = bridge_lookup_member_if(sc, ifp);
-	if (bif == NULL)
-		return (m);
+	if (bif == NULL) {
+		ether_input(ifp, m);
+		return;
+	}
 
 	eh = mtod(m, struct ether_header *);
 
-	if (m->m_flags & (M_BCAST|M_MCAST)) {
-		if (bif->bif_flags & IFBIF_STP) {
-			/* Tap off 802.1D packets; they do not get forwarded. */
-			if (memcmp(eh->ether_dhost, bstp_etheraddr,
-			    ETHER_ADDR_LEN) == 0) {
-				m = bstp_input(sc, bif, m);
-				if (m == NULL)
-					return (NULL);
-			}
+	if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
+		if (memcmp(etherbroadcastaddr,
+		    eh->ether_dhost, ETHER_ADDR_LEN) == 0)
+			m->m_flags |= M_BCAST;
+		else
+			m->m_flags |= M_MCAST;
+	}
 
-			switch (bif->bif_state) {
-			case BSTP_IFSTATE_BLOCKING:
-			case BSTP_IFSTATE_LISTENING:
-			case BSTP_IFSTATE_DISABLED:
-				return (m);
+	/* A 'fast' path for packets addressed to interfaces that are
+	 * part of this bridge. */
+	if ((m->m_flags & (M_BCAST|M_MCAST)) == 0 
+	    && (!(bif->bif_flags & IFBIF_STP) || bif->bif_state == BSTP_IFSTATE_FORWARDING)) {
+		struct bridge_iflist *_bif = bif;
+
+		LIST_FOREACH(_bif, &sc->sc_iflist, bif_next) {
+			/* It is destined for us. */
+			if (memcmp(CLLADDR(_bif->bif_ifp->if_sadl),
+				   eh->ether_dhost, ETHER_ADDR_LEN) == 0
+#if NCARP > 0
+			    || (_bif->bif_ifp->if_carp
+				&& carp_ourether(_bif->bif_ifp->if_carp,
+						 eh, IFT_ETHER, 0) != NULL)
+#endif /* NCARP > 0 */
+				) {
+				m->m_pkthdr.rcvif = _bif->bif_ifp;
+				if (_bif->bif_flags & IFBIF_LEARNING)
+					bridge_rtupdate(sc, eh->ether_shost,
+							ifp, 0, IFBAF_DYNAMIC);
+				ether_input (_bif->bif_ifp, m);
+				return;
 			}
-		}
 
-		/*
-		 * Make a deep copy of the packet and enqueue the copy
-		 * for bridge processing; return the original packet for
-		 * local processing.
-		 */
-		mc = m_dup(m, 0, M_COPYALL, M_NOWAIT);
-		if (mc == NULL)
-			return m;
-
-		/* Perform the bridge forwarding function with the copy. */
-		if (__predict_false(!pktq_enqueue(sc->sc_fwd_pktq, mc, 0))) {
-			m_freem(mc);
-			return m;
+			/* We just received a packet that we sent out. */
+			if (memcmp(CLLADDR(_bif->bif_ifp->if_sadl),
+				   eh->ether_shost, ETHER_ADDR_LEN) == 0
+#if NCARP > 0
+			    || (_bif->bif_ifp->if_carp
+				&& carp_ourether(_bif->bif_ifp->if_carp,
+						 eh, IFT_ETHER, 1) != NULL)
+#endif /* NCARP > 0 */
+				) {
+				m_freem(m);
+				return;
+			}
 		}
-
-		/* Return the original packet for local processing. */
-		return (m);
 	}
 
-	if (bif->bif_flags & IFBIF_STP) {
-		switch (bif->bif_state) {
-		case BSTP_IFSTATE_BLOCKING:
-		case BSTP_IFSTATE_LISTENING:
-		case BSTP_IFSTATE_DISABLED:
-			return (m);
-		}
+	/* Tap off 802.1D packets if we are running STP; they do not get forwarded. */
+	if ((bif->bif_flags & IFBIF_STP)
+	    && memcmp(eh->ether_dhost, bstp_etheraddr, ETHER_ADDR_LEN) == 0
+	    && bif->bif_state != BSTP_IFSTATE_DISABLED) {
+		bstp_input(sc, bif, m);
+		return;
 	}
 
 	/*
-	 * Unicast.  Make sure it's not for us.
+	 * A normal switch would discard the packet here, but that's not what
+	 * we've done historically. This also prevents some obnoxious behaviour.
 	 */
-	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
-		/* It is destined for us. */
-		if (memcmp(CLLADDR(bif->bif_ifp->if_sadl), eh->ether_dhost,
-		    ETHER_ADDR_LEN) == 0
-#if NCARP > 0
-		    || (bif->bif_ifp->if_carp && carp_ourether(bif->bif_ifp->if_carp,
-			eh, IFT_ETHER, 0) != NULL)
-#endif /* NCARP > 0 */
-		    ) {
-			if (bif->bif_flags & IFBIF_LEARNING)
-				(void) bridge_rtupdate(sc,
-				    eh->ether_shost, ifp, 0, IFBAF_DYNAMIC);
-			m->m_pkthdr.rcvif = bif->bif_ifp;
-			return (m);
-		}
-
-		/* We just received a packet that we sent out. */
-		if (memcmp(CLLADDR(bif->bif_ifp->if_sadl), eh->ether_shost,
-		    ETHER_ADDR_LEN) == 0
-#if NCARP > 0
-		    || (bif->bif_ifp->if_carp && carp_ourether(bif->bif_ifp->if_carp,
-			eh, IFT_ETHER, 1) != NULL)
-#endif /* NCARP > 0 */
-		    ) {
-			m_freem(m);
-			return (NULL);
-		}
+	if ((bif->bif_flags & IFBIF_STP) 
+	    && bif->bif_state != BSTP_IFSTATE_FORWARDING) {
+		ether_input(ifp, m);
+		return;
 	}
 
-	/* Perform the bridge forwarding function. */
+	/* Queue the packet for bridge forwarding. */
 	if (__predict_false(!pktq_enqueue(sc->sc_fwd_pktq, m, 0)))
 		m_freem(m);
 
-	return (NULL);
+	return;
 }
 
+
 /*
  * bridge_broadcast:
  *
  *	Send a frame to all interfaces that are members of
  *	the bridge, except for the one on which the packet
- *	arrived.
+ *	arrived. And receive the original frame for
+ *	local processing if M_BCAST or M_MCAST.
  */
 static void
 bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
@@ -1685,13 +1683,10 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 {
 	struct bridge_iflist *bif;
 	struct mbuf *mc;
-	struct ifnet *dst_if;
-	int used = 0;
 
+	/* Send to a copied frame to each member interface other than the source */
 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
-		dst_if = bif->bif_ifp;
-		if (dst_if == src_if)
-			continue;
+		struct ifnet *dst_if = bif->bif_ifp;
 
 		if (bif->bif_flags & IFBIF_STP) {
 			switch (bif->bif_state) {
@@ -1708,21 +1703,25 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 		if ((dst_if->if_flags & IFF_RUNNING) == 0)
 			continue;
 
-		if (LIST_NEXT(bif, bif_next) == NULL) {
-			mc = m;
-			used = 1;
-		} else {
-			mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
-			if (mc == NULL) {
-				sc->sc_if.if_oerrors++;
-				continue;
-			}
+		if (dst_if == src_if)
+			continue;
+
+		mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+		if (mc == NULL) {
+			sc->sc_if.if_oerrors++;
+			continue;
 		}
 
 		bridge_enqueue(sc, dst_if, mc, 1);
 	}
-	if (used == 0)
+
+	if ((m->m_flags & (M_BCAST|M_MCAST)) != 0) {
+		/* Receiv the original frame */
+		m->m_pkthdr.rcvif = src_if;
+		ether_input(src_if, m);
+	} else {
 		m_freem(m);
+	}
 }
 
 /*
diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h
index 6b4acf7..2e5d373 100644
--- a/sys/net/if_bridgevar.h
+++ b/sys/net/if_bridgevar.h
@@ -313,11 +313,10 @@ void	bridge_ifdetach(struct ifnet *);
 
 int	bridge_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
 	    struct rtentry *);
-struct mbuf *bridge_input(struct ifnet *, struct mbuf *);
 
 void	bstp_initialization(struct bridge_softc *);
 void	bstp_stop(struct bridge_softc *);
-struct mbuf *bstp_input(struct bridge_softc *, struct bridge_iflist *, struct mbuf *);
+void	bstp_input(struct bridge_softc *, struct bridge_iflist *, struct mbuf *);
 
 void	bridge_enqueue(struct bridge_softc *, struct ifnet *, struct mbuf *,
 	    int);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index fa9fc0e..c99bce7 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -640,29 +640,6 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
 
 	ifp->if_ibytes += m->m_pkthdr.len;
 
-#if NBRIDGE > 0
-	/*
-	 * Tap the packet off here for a bridge.  bridge_input()
-	 * will return NULL if it has consumed the packet, otherwise
-	 * it gets processed as normal.  Note that bridge_input()
-	 * will always return the original packet if we need to
-	 * process it locally.
-	 */
-	if (ifp->if_bridge) {
-		/* clear M_PROMISC, in case the packets comes from a vlan */
-		m->m_flags &= ~M_PROMISC;
-		m = bridge_input(ifp, m);
-		if (m == NULL)
-			return;
-
-		/*
-		 * Bridge has determined that the packet is for us.
-		 * Update our interface pointer -- we may have had
-		 * to "bridge" the packet locally.
-		 */
-		ifp = m->m_pkthdr.rcvif;
-	} else
-#endif /* NBRIDGE > 0 */
 	{
 
 #if NCARP > 0