summaryrefslogtreecommitdiffstats
path: root/sys/netmpls/mpls_input.c
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-01-27 04:20:59 +0000
committerdlg <dlg@openbsd.org>2019-01-27 04:20:59 +0000
commitc6de5097b19f89fef4de151fa9cfd25da3a0a05f (patch)
tree034eb202f45c92facf8aeec383b00bff78bdb081 /sys/netmpls/mpls_input.c
parentzap a commented out line. 0RTT will need more thought than (diff)
downloadwireguard-openbsd-c6de5097b19f89fef4de151fa9cfd25da3a0a05f.tar.xz
wireguard-openbsd-c6de5097b19f89fef4de151fa9cfd25da3a0a05f.zip
change how packets are pushed into mpe(4).
mpe(4) adds itself ot the mpls rtable with RTF_LOCAL set, which pushes the packet through mpe_output, which sees RTF_LOCAL can calls mpe_input. this follows what mpw(4) does, and removes a special case in mpls_input.
Diffstat (limited to 'sys/netmpls/mpls_input.c')
-rw-r--r--sys/netmpls/mpls_input.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index f0b6ce11e09..57355e287cb 100644
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_input.c,v 1.71 2019/01/27 02:24:49 dlg Exp $ */
+/* $OpenBSD: mpls_input.c,v 1.72 2019/01/27 04:20:59 dlg Exp $ */
/*
* Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -204,13 +204,6 @@ do_v6:
m_freem(m);
goto done;
}
-#if NMPE > 0
- if (ifp->if_type == IFT_MPLS) {
- smpls = satosmpls(rt_key(rt));
- mpe_input(m, ifp, smpls, ttl);
- goto done;
- }
-#endif
KASSERT(rt->rt_gateway);