summaryrefslogtreecommitdiff
path: root/sys/netmpls
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-01-27 01:39:06 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-01-27 01:39:06 +0000
commit16c0aa307a0fb5af02c574276bf54af0142b96b3 (patch)
tree952163beffbeee9bb4eeed76869226310fb8810a /sys/netmpls
parenteab6d8a244fe5d43fba7117a2b5bde135bfb049f (diff)
forgot to commit the tweaks to mpls_input when mpw became an ethernet iface
the input mechanism for mpw is now that it inserts a tag into the mpls table with RTF_LOCAL set. mpls_input falls through to calling the interface output routine (mpw_output in this case) which looks for that RTF_LOCAL and then calls mpw_input against that mbuf. ok claudio@ who is keep to apply this semantic to mpe
Diffstat (limited to 'sys/netmpls')
-rw-r--r--sys/netmpls/mpls_input.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index d4f7d48b15f..a32e0e00e0a 100644
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_input.c,v 1.69 2019/01/26 06:58:08 dlg Exp $ */
+/* $OpenBSD: mpls_input.c,v 1.70 2019/01/27 01:39:05 dlg Exp $ */
/*
* Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -205,10 +205,6 @@ do_v6:
goto done;
}
#endif
- if (ifp->if_type == IFT_MPLSTUNNEL) {
- ifp->if_output(ifp, m, rt_key(rt), rt);
- goto done;
- }
KASSERT(rt->rt_gateway);
@@ -223,6 +219,8 @@ do_v6:
goto done;
break;
#endif
+ case AF_LINK:
+ break;
default:
m_freem(m);
goto done;