aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2007-12-21 05:30:47 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2007-12-21 05:30:47 +0000
commit9ca01152e87fe433dfd634eed7ddad779e2172a1 (patch)
treea1c756fb3d68b01a9fe5b9dca211470a6b1b1a6a
parentf34d9cc44c8852744ab79b27495b24fecd01bb56 (diff)
Notes
-rw-r--r--sys/net/if_bridge.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 5a010882ec6d..5bb8d8af1c01 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -2063,6 +2063,13 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
if (memcmp(eh->ether_dhost, IF_LLADDR(bifp),
ETHER_ADDR_LEN) == 0) {
+ /* Block redundant paths to us */
+ if ((bif->bif_flags & IFBIF_STP) &&
+ bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
+ BRIDGE_UNLOCK(sc);
+ return (m);
+ }
+
/*
* Filter on the physical interface.
*/