diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2019-02-26 03:44:51 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2019-02-26 03:44:51 +0000 |
| commit | ea1cf13d6e3687af26977efcd36f8debfc726d82 (patch) | |
| tree | d34a60da956f2a3ec229c70dbd6c035d8aca80fb /sys | |
| parent | d44d5cd07b33233f0e5b232e6a5e0c0b8966ec1e (diff) | |
don't check the pseudowire type in tx and rx paths.
whether the mpw interface is advertising "ethernet" or "ethernet-
tagged" is something the ends of the wire agree on (ie, ldpd is
configured a certain way), it is not something that affects ethernet
encap or decap.
the MPW ioctls can still configure it and read it, but it has no
bearing on how the driver operates on packets.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_mpw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c index 4b6633624dc..4348dff3f25 100644 --- a/sys/net/if_mpw.c +++ b/sys/net/if_mpw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpw.c,v 1.45 2019/02/26 03:22:36 dlg Exp $ */ +/* $OpenBSD: if_mpw.c,v 1.46 2019/02/26 03:44:50 dlg Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena <rzalamena@openbsd.org> @@ -488,9 +488,6 @@ mpw_input(struct mpw_softc *sc, struct mbuf *m) if (!ISSET(ifp->if_flags, IFF_RUNNING)) goto drop; - if (sc->sc_type == IMR_TYPE_NONE) - goto drop; - shim = mtod(m, struct shim_hdr *); if (sc->sc_fword) { uint32_t flow; @@ -604,7 +601,6 @@ mpw_start(struct ifnet *ifp) n = sc->sc_neighbor; if (!ISSET(ifp->if_flags, IFF_RUNNING) || - sc->sc_type == IMR_TYPE_NONE || n == NULL) { IFQ_PURGE(&ifp->if_snd); return; |