 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bridge.c,v 1.99 2015/06/01 06:14:43 matt Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -70,27 +70,27 @@
 /*
  * Network interface bridge support.
+ *
  * TODO:
+ *
  *	- Currently only supports Ethernet-like interfaces (Ethernet,
  *	  802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *	  to bridge other types of interfaces (FDDI-FDDI, and maybe
  *	  consider heterogenous bridges).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.99 2015/06/01 06:14:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h> /* for softnet_lock */
 #include <sys/sockio.h>
 @@ -1932,29 +1932,30 @@ bridge_input(struct ifnet *ifp, struct m
 				bridge_release_member(sc, _bif);
 				goto out;
+			}
 			/* We just received a packet that we sent out. */
 			if (bridge_ourether(_bif, eh, 1))
 				break;
+		}
 		BRIDGE_PSZ_REXIT(s);
 out:
 		if (_bif != NULL) {
 			bridge_release_member(sc, bif);
-			if (_ifp != NULL)
+			if (_ifp != NULL) {
 				m->m_flags &= ~M_PROMISC;
 				ether_input(_ifp, m);
-			else
+			} else
 				m_freem(m);
 			return;
+		}
+	}
 	/* Tap off 802.1D packets; they do not get forwarded. */
 	if (bif->bif_flags & IFBIF_STP &&
 	    memcmp(eh->ether_dhost, bstp_etheraddr, ETHER_ADDR_LEN) == 0) {
 		bstp_input(sc, bif, m);
 		bridge_release_member(sc, bif);
 		return;
+	}
 @@ -1979,78 +1980,81 @@ out:
  * bridge_broadcast:
+ *
  *	Send a frame to all interfaces that are members of
  *	the bridge, except for the one on which the packet
  *	arrived.
  */
 static void
 bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
     struct mbuf *m)
+{
 	struct bridge_iflist *bif;
 	struct mbuf *mc;
 	struct ifnet *dst_if;
-	bool used, bmcast;
+	bool bmcast;
 	int s;
-	used = bmcast = m->m_flags & (M_BCAST|M_MCAST);
+	bmcast = m->m_flags & (M_BCAST|M_MCAST);
 	BRIDGE_PSZ_RENTER(s);
 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
 		bif = bridge_try_hold_bif(bif);
 		if (bif == NULL)
 			continue;
 		BRIDGE_PSZ_REXIT(s);
 		dst_if = bif->bif_ifp;
 		if (dst_if == src_if)
 			goto next;
 		if (bif->bif_flags & IFBIF_STP) {
 			switch (bif->bif_state) {
 			case BSTP_IFSTATE_BLOCKING:
 			case BSTP_IFSTATE_DISABLED:
 				goto next;
+			}
+		}
 		if ((bif->bif_flags & IFBIF_DISCOVER) == 0 && !bmcast)
 			goto next;
 		if ((dst_if->if_flags & IFF_RUNNING) == 0)
 			goto next;
-		if (!used && LIST_NEXT(bif, bif_next) == NULL) {
+		if (dst_if != src_if) {
 			mc = m;
 			used = true;
 		} else {
 			mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
 			if (mc == NULL) {
 				sc->sc_if.if_oerrors++;
 				goto next;
+			}
 			bridge_enqueue(sc, dst_if, mc, 1);
+		}
-		bridge_enqueue(sc, dst_if, mc, 1);
+		if (bmcast) {
 			mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
 			if (mc == NULL) {
 				sc->sc_if.if_oerrors++;
 				goto next;
+			}
 			mc->m_pkthdr.rcvif = dst_if;
 			mc->m_flags &= ~M_PROMISC;
 			ether_input(dst_if, mc);
+		}
 next:
 		bridge_release_member(sc, bif);
 		BRIDGE_PSZ_RENTER(s);
+	}
 	BRIDGE_PSZ_REXIT(s);
-	if (bmcast)
+	m_freem(m);
 		ether_input(src_if, m);
 	else if (!used)
 		m_freem(m);
+}
 static int
 bridge_rtalloc(struct bridge_softc *sc, const uint8_t *dst,
     struct bridge_rtnode **brtp)
+{
 	struct bridge_rtnode *brt;
 	int error;
 	if (sc->sc_brtcnt >= sc->sc_brtmax)
 		return ENOSPC;
 	/*