diff options
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index f52ae79ee5e..3c59874b615 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.319 2019/01/29 17:47:35 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.320 2019/02/14 17:51:25 mpi Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -36,7 +36,6 @@ #include "pf.h" #include "carp.h" #include "vlan.h" -#include "mpw.h" #include <sys/param.h> #include <sys/systm.h> @@ -311,13 +310,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ifpromisc(ifs, 1); if (error != 0) break; - } -#if NMPW > 0 - else if (ifs->if_type == IFT_MPLSTUNNEL) { - /* Nothing needed */ - } -#endif /* NMPW */ - else { + } else { error = EINVAL; break; } @@ -367,8 +360,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } - if (ifs->if_type != IFT_ETHER && - ifs->if_type != IFT_MPLSTUNNEL) { + if (ifs->if_type != IFT_ETHER) { error = EINVAL; break; } @@ -813,15 +805,6 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa, (bif->bif_flags & IFBIF_STP) && (bif->bif_state == BSTP_IFSTATE_DISCARDING)) continue; -#if NMPW > 0 - /* - * Split horizon: avoid broadcasting messages from - * wire to another wire. - */ - if (ifp->if_type == IFT_MPLSTUNNEL && - dst_if->if_type == IFT_MPLSTUNNEL) - continue; -#endif /* NMPW */ if ((bif->bif_flags & IFBIF_DISCOVER) == 0 && (m->m_flags & (M_BCAST | M_MCAST)) == 0) continue; @@ -1277,16 +1260,6 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *ifp, if (bridge_localbroadcast(dst_if, eh, m)) sc->sc_if.if_oerrors++; -#if NMPW > 0 - /* - * Split horizon: avoid broadcasting messages from wire to - * another wire. - */ - if (ifp->if_type == IFT_MPLSTUNNEL && - dst_if->if_type == IFT_MPLSTUNNEL) - continue; -#endif /* NMPW */ - /* If last one, reuse the passed-in mbuf */ if (SLIST_NEXT(bif, bif_next) == NULL) { mc = m; |